Commit b5707692 authored by Philipp Stephani's avatar Philipp Stephani Committed by John Wiegley

Remove undefined behavior in OS X dumper.

Found by Address Sanitizer.

* src/unexmacosx.c (unexec_write): Use Mach virtual memory API to
avoid undefined behavior when reading arbitrary memory.
parent 97211f36
...@@ -103,9 +103,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -103,9 +103,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <mach/mach.h> #include <mach/mach.h>
#include <mach/vm_map.h>
#include <mach-o/loader.h> #include <mach-o/loader.h>
#include <mach-o/reloc.h> #include <mach-o/reloc.h>
#ifdef HAVE_MALLOC_MALLOC_H #ifdef HAVE_MALLOC_MALLOC_H
...@@ -217,10 +219,27 @@ unexec_read (void *dest, size_t n) ...@@ -217,10 +219,27 @@ unexec_read (void *dest, size_t n)
static int static int
unexec_write (off_t dest, const void *src, size_t count) unexec_write (off_t dest, const void *src, size_t count)
{ {
task_t task = mach_task_self();
if (task == MACH_PORT_NULL || task == MACH_PORT_DEAD)
return false;
if (lseek (outfd, dest, SEEK_SET) != dest) if (lseek (outfd, dest, SEEK_SET) != dest)
return 0; return 0;
return write (outfd, src, count) == count; /* We use the Mach virtual memory API to read our process memory
because using src directly would be undefined behavior and fails
under Address Sanitizer. */
bool success = false;
vm_offset_t data;
mach_msg_type_number_t data_count;
if (vm_read (task, (uintptr_t) src, count, &data, &data_count)
== KERN_SUCCESS)
{
success =
write (outfd, (const void *) (uintptr_t) data, data_count) == count;
vm_deallocate (task, data, data_count);
}
return success;
} }
/* Write COUNT bytes of zeros to outfd starting at offset DEST. /* Write COUNT bytes of zeros to outfd starting at offset DEST.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment