|
From: <sv...@va...> - 2010-12-08 23:23:01
|
Author: njn
Date: 2010-12-08 23:22:53 +0000 (Wed, 08 Dec 2010)
New Revision: 11487
Log:
Merge from trunk, r11485 (roundup sizes for shmat)
Modified:
branches/VALGRIND_3_6_BRANCH/coregrind/m_syswrap/syswrap-generic.c
Modified: branches/VALGRIND_3_6_BRANCH/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/VALGRIND_3_6_BRANCH/coregrind/m_syswrap/syswrap-generic.c 2010-12-08 23:21:55 UTC (rev 11486)
+++ branches/VALGRIND_3_6_BRANCH/coregrind/m_syswrap/syswrap-generic.c 2010-12-08 23:22:53 UTC (rev 11487)
@@ -1772,7 +1772,7 @@
UWord res,
UWord arg0, UWord arg1, UWord arg2 )
{
- UInt segmentSize = get_shm_size ( arg0 );
+ UInt segmentSize = VG_PGROUNDUP(get_shm_size(arg0));
if ( segmentSize > 0 ) {
UInt prot = VKI_PROT_READ|VKI_PROT_WRITE;
Bool d;
@@ -1789,7 +1789,7 @@
cope with the discrepancy, aspacem's sync checker omits the
dev/ino correspondence check in cases where V does not know
the dev/ino. */
- d = VG_(am_notify_client_shmat)( res, VG_PGROUNDUP(segmentSize), prot );
+ d = VG_(am_notify_client_shmat)( res, segmentSize, prot );
/* we don't distinguish whether it's read-only or
* read-write -- it doesn't matter really. */
|