replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug in AsanProcMaps on Mac: on 64 bits the program was trying to read twice as many segment load commands as the binary actually contained. 

llvm-svn: 149063
This commit is contained in:
Alexander Potapenko 2012-01-26 17:01:20 +00:00
parent c8f2b7877b
commit 98f0c713d9
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler-rt/lib/asan/asan_mac.cc
View File

@ -177,6 +177,7 @@ void AsanProcMaps::Reset() {
current_image_ = _dyld_image_count();
current_load_cmd_count_ = -1;
current_load_cmd_addr_ = NULL;
current_magic_ = 0;
}
// Next and NextSegmentLoad were inspired by base/sysinfo.cc in
@ -202,6 +203,8 @@ bool AsanProcMaps::NextSegmentLoad(
real_strncpy(filename, _dyld_get_image_name(current_image_),
filename_size);
}
if (FLAG_v >= 4)
Report("LC_SEGMENT: %p--%p %s+%p\n", *start, *end, filename, *offset);
return true;
}
return false;
@ -216,7 +219,8 @@ bool AsanProcMaps::Next(uintptr_t *start, uintptr_t *end,
if (current_load_cmd_count_ < 0) {
// Set up for this image;
current_load_cmd_count_ = hdr->ncmds;
switch (hdr->magic) {
current_magic_ = hdr->magic;
switch (current_magic_) {
#ifdef MH_MAGIC_64
case MH_MAGIC_64: {
current_load_cmd_addr_ = (char*)hdr + sizeof(mach_header_64);
@ -233,18 +237,24 @@ bool AsanProcMaps::Next(uintptr_t *start, uintptr_t *end,
}
}
// We start with the next load command (we've already looked at this one).
for (current_load_cmd_count_--;
current_load_cmd_count_ >= 0;
current_load_cmd_count_--) {
for (; current_load_cmd_count_ >= 0; current_load_cmd_count_--) {
switch (current_magic_) {
// current_magic_ may be only one of MH_MAGIC, MH_MAGIC_64.
#ifdef MH_MAGIC_64
if (NextSegmentLoad<LC_SEGMENT_64, struct segment_command_64>(
start, end, offset, filename, filename_size))
return true;
case MH_MAGIC_64: {
if (NextSegmentLoad<LC_SEGMENT_64, struct segment_command_64>(
start, end, offset, filename, filename_size))
return true;
break;
}
#endif
if (NextSegmentLoad<LC_SEGMENT, struct segment_command>(
start, end, offset, filename, filename_size))
return true;
case MH_MAGIC: {
if (NextSegmentLoad<LC_SEGMENT, struct segment_command>(
start, end, offset, filename, filename_size))
return true;
break;
}
}
}
// If we get here, no more load_cmd's in this image talk about
// segments. Go on to the next image.

1
compiler-rt/lib/asan/asan_procmaps.h
View File

@ -64,6 +64,7 @@ class AsanProcMaps {
char *current_;
#elif defined __APPLE__
int current_image_;
uint32_t current_magic_;
int current_load_cmd_count_;
char *current_load_cmd_addr_;
#endif