And some more follow up for 376956 syswrap of SNDDRV and DRM_IOCTL_VERSION

causing some addresses to be wrongly marked as addressable

Just in case, do the assert after ARG2 has been truncated to 32 bits,
to avoid comparing sign extended requests on 64 bits.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16278

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 8d2f7d880b914b6ab674ea8659e176d8942082ef..4136f59b4f167f14141eb6093eaae2034459d4b2 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -9013,10 +9013,10 @@ PRE(sys_ioctl)
 
 POST(sys_ioctl)
 {
-   vg_assert(SUCCESS || (FAILURE && VKI_DRM_IOCTL_VERSION == ARG2));
-
    ARG2 = (UInt)ARG2;
 
+   vg_assert(SUCCESS || (FAILURE && VKI_DRM_IOCTL_VERSION == ARG2));
+
    /* --- BEGIN special IOCTL handlers for specific Android hardware --- */
 
    /* BEGIN undocumented ioctls for PowerVR SGX 540 (the GPU on Nexus S) */