|
From: <sv...@va...> - 2010-10-12 22:47:18
|
Author: sewardj
Date: 2010-10-12 23:47:09 +0100 (Tue, 12 Oct 2010)
New Revision: 11435
Log:
Changes to make exp-ptrcheck work reasonable on Fedora 14 x86:
* looks_like_a_pointer: x86-linux: halve lower threshold value
to take account of evident address space randomisation done
by Fedora 14 on x86
* handle __NR_lgetxattr
* move __NR_mq_* entries to the correct place (tidyup only)
Modified:
trunk/exp-ptrcheck/h_main.c
Modified: trunk/exp-ptrcheck/h_main.c
===================================================================
--- trunk/exp-ptrcheck/h_main.c 2010-10-12 18:08:33 UTC (rev 11434)
+++ trunk/exp-ptrcheck/h_main.c 2010-10-12 22:47:09 UTC (rev 11435)
@@ -2342,6 +2342,7 @@
ADD(0, __NR_ioctl); // ioctl -- assuming no pointers returned
ADD(0, __NR_ioprio_get);
ADD(0, __NR_kill);
+ ADD(0, __NR_lgetxattr);
ADD(0, __NR_link);
# if defined(__NR_listen)
ADD(0, __NR_listen);
@@ -2356,6 +2357,14 @@
ADD(0, __NR_mlock);
ADD(0, __NR_mlockall);
ADD(0, __NR_mprotect);
+# if defined(__NR_mq_open)
+ ADD(0, __NR_mq_open);
+ ADD(0, __NR_mq_unlink);
+ ADD(0, __NR_mq_timedsend);
+ ADD(0, __NR_mq_timedreceive);
+ ADD(0, __NR_mq_notify);
+ ADD(0, __NR_mq_getsetattr);
+# endif
ADD(0, __NR_munmap); // die_mem_munmap already called, segment remove);
ADD(0, __NR_nanosleep);
ADD(0, __NR_open);
@@ -2483,14 +2492,6 @@
ADD(0, __NR_wait4);
ADD(0, __NR_write);
ADD(0, __NR_writev);
-# if defined(__NR_mq_open)
- ADD(0, __NR_mq_open);
- ADD(0, __NR_mq_unlink);
- ADD(0, __NR_mq_timedsend);
- ADD(0, __NR_mq_timedreceive);
- ADD(0, __NR_mq_notify);
- ADD(0, __NR_mq_getsetattr);
-# endif
/* Whereas the following need special treatment */
# if defined(__NR_arch_prctl)
@@ -2740,7 +2741,7 @@
{
# if defined(VGA_x86) || defined(VGA_ppc32)
tl_assert(sizeof(UWord) == 4);
- return (a > 0x01000000UL && a < 0xFF000000UL);
+ return (a > 0x800000UL && a < 0xFF000000UL);
# elif defined(VGA_amd64) || defined(VGA_ppc64)
tl_assert(sizeof(UWord) == 8);
|