From: Tom Hughes <tom@compton.nu>
Date: Thu, 10 Jun 2010 15:01:02 +0000 (+0000)
Subject: Fixed bogus check of RES in the ioctl PRE handler introduced
X-Git-Tag: svn/VALGRIND_3_6_0~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=725752d4ea02e01871671a19507484c7dda41bf3;p=thirdparty%2Fvalgrind.git

Fixed bogus check of RES in the ioctl PRE handler introduced
in r11124 while fixing #235642.


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

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index b3b4ccf667..9c47dfb2b2 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -4842,8 +4842,7 @@ PRE(sys_ioctl)
       case VKI_EVIOCGBIT(VKI_EV_FF,0):
       case VKI_EVIOCGBIT(VKI_EV_PWR,0):
       case VKI_EVIOCGBIT(VKI_EV_FF_STATUS,0):
-         if (RES > 0)
-            PRE_MEM_WRITE("ioctl(EVIO*)", ARG3, _VKI_IOC_SIZE(ARG2));
+         PRE_MEM_WRITE("ioctl(EVIO*)", ARG3, _VKI_IOC_SIZE(ARG2));
          break;
       default:
          ML_(PRE_unknown_ioctl)(tid, ARG2, ARG3);