diff options
authorMike Frysinger <vapier@gentoo.org>2009-10-26 03:53:09 -0400
committerMike Frysinger <vapier@gentoo.org>2009-10-26 03:53:09 -0400
commitbf79706bc65de415cb0dd82aeba55164cd4cca96 (patch)
tree31f74e401d621a7e161ca2b9e62d1a09e7c027b9 /libsandbox/memory.c
parentbump to sandbox-2.3 (diff)
libsandbox: use mmap directly for internal memory
Some packages that do library tricks like sandbox override the mmap() symbols. If their implementation ends up calling functions that sandbox has overridden, then we can easily hit an infinite loop. sb-fopen -> sb-malloc -> external mmap -> sb-open -> whoops! So for the internal memory functions, make sure we call directly to the C library's mmap() functions. This way our internal memory implementation should be free from external forces. URL: http://bugs.gentoo.org/290249 Reported-by: Diego E. Pettenò <flameeyes@gentoo.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'libsandbox/memory.c')
1 files changed, 20 insertions, 0 deletions
diff --git a/libsandbox/memory.c b/libsandbox/memory.c
index 05e9691..bc0400f 100644
--- a/libsandbox/memory.c
+++ b/libsandbox/memory.c
@@ -15,6 +15,26 @@
#include "libsandbox.h"
#include "sbutil.h"
+/* Well screw me sideways, someone decided to override mmap() #290249
+ * We probably don't need to include the exact sym version ...
+ */
+static void *(*_sb_mmap)(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
+static void *sb_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+ if (!_sb_mmap)
+ _sb_mmap = get_dlsym("mmap", NULL);
+ return _sb_mmap(addr, length, prot, flags, fd, offset);
+#define mmap sb_mmap
+static int (*_sb_munmap)(void *addr, size_t length);
+static int sb_munmap(void *addr, size_t length)
+ if (!_sb_munmap)
+ _sb_munmap = get_dlsym("munmap", NULL);
+ return _sb_munmap(addr, length);
+#define munmap sb_munmap
#define SB_MALLOC_TO_MMAP(ptr) ((void*)(((size_t*)ptr) - 1))
#define SB_MMAP_TO_MALLOC(ptr) ((void*)(((size_t*)ptr) + 1))
#define SB_MALLOC_TO_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr)))