From: Philippe Waroquiers Date: Fri, 17 Mar 2017 18:45:23 +0000 (+0000) Subject: And some more follow up for 376956 syswrap of SNDDRV and DRM_IOCTL_VERSION X-Git-Tag: svn/VALGRIND_3_13_0~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c54854475c331d7035bb1f42ef1eb4a07f4707d0;p=thirdparty%2Fvalgrind.git 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 8d2f7d880b..4136f59b4f 100644 --- 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) */