From: Julian Seward Date: Sun, 23 Nov 2014 12:38:22 +0000 (+0000) Subject: Merge, from trunk, r14646 (just the fix, not the test) X-Git-Tag: svn/VALGRIND_3_10_1~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90956c3755b584d161d7576afe62ea3a113e8e80;p=thirdparty%2Fvalgrind.git Merge, from trunk, r14646 (just the fix, not the test) 339706 Fix false positive for ioctl(TIOCSIG) on linux 14646 (just the fix) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14755 --- diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index 9f6623ef98..e36036f21a 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -5481,6 +5481,7 @@ PRE(sys_ioctl) case VKI_TCXONC: case VKI_TCSBRKP: case VKI_TCFLSH: + case VKI_TIOCSIG: /* These just take an int by value */ break; case VKI_TIOCGWINSZ: @@ -8269,6 +8270,7 @@ POST(sys_ioctl) case VKI_TCXONC: case VKI_TCSBRKP: case VKI_TCFLSH: + case VKI_TIOCSIG: break; case VKI_TIOCGWINSZ: POST_MEM_WRITE( ARG3, sizeof(struct vki_winsize) ); diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h index d7196604df..cb701972cb 100644 --- a/include/vki/vki-linux.h +++ b/include/vki/vki-linux.h @@ -2955,6 +2955,10 @@ struct vki_getcpu_cache { #define VKI_FIOQSIZE 0x5460 /* Value differs on some platforms */ #endif +#ifndef VKI_TIOCSIG +#define VKI_TIOCSIG _VKI_IOW('T', 0x36, int) /* Value differs on some platforms */ +#endif + //---------------------------------------------------------------------- // From kernel/common/include/linux/ashmem.h //----------------------------------------------------------------------