summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-02-07 00:47:35 +0000
committerKostya Serebryany <kcc@google.com>2012-02-07 00:47:35 +0000
commit614b53de1bad5627047adb0c5f452ef9b8517968 (patch)
treeda5a2c4cd0ec5381870f8f37fa0cf138e584b343
parentece0409a1a45895985a18dfc6c77c497e7ea4de7 (diff)
downloadbcm5719-llvm-614b53de1bad5627047adb0c5f452ef9b8517968.tar.gz
bcm5719-llvm-614b53de1bad5627047adb0c5f452ef9b8517968.zip
[asan] don't crash if /proc/self/maps has enormous size (linux)
llvm-svn: 149944
-rw-r--r--compiler-rt/lib/asan/asan_linux.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_linux.cc b/compiler-rt/lib/asan/asan_linux.cc
index cf1e6abc879..01a019eac85 100644
--- a/compiler-rt/lib/asan/asan_linux.cc
+++ b/compiler-rt/lib/asan/asan_linux.cc
@@ -131,7 +131,7 @@ const char* AsanGetEnv(const char* name) {
inited = true;
size_t environ_size;
len = ReadFileToBuffer("/proc/self/environ",
- &environ, &environ_size, 1 << 20);
+ &environ, &environ_size, 1 << 26);
}
if (!environ || len == 0) return NULL;
size_t namelen = internal_strlen(name);
@@ -160,7 +160,7 @@ int AsanClose(int fd) {
AsanProcMaps::AsanProcMaps() {
proc_self_maps_buff_len_ =
ReadFileToBuffer("/proc/self/maps", &proc_self_maps_buff_,
- &proc_self_maps_buff_mmaped_size_, 1 << 20);
+ &proc_self_maps_buff_mmaped_size_, 1 << 26);
CHECK(proc_self_maps_buff_len_ > 0);
// AsanWrite(2, proc_self_maps_buff_, proc_self_maps_buff_len_);
Reset();
OpenPOWER on IntegriCloud