Add SIOCATMARK ioctl support.

Patch from Austin English via BZ#335441.

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

diff --git a/NEWS b/NEWS
index 22e62503937f53d8dcc45cd4b9bed3051af38c90..5714944cbd9871688e9646847dcdaaccb0bc1454 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -165,6 +165,7 @@ where XXXXXX is the bug number as listed below.
 335155  vgdb, fix error print statement.
 335262  arm64: movi 8bit version is not supported
 335263  arm64: dmb instruction is not implemented
+335441  unhandled ioctl 0x8905 (SIOCATMARK) when running wine under valgrind
 335496  arm64: sbc/abc instructions are not implemented
 n-i-bz  Fix KVM_CREATE_IRQCHIP ioctl handling
 n-i-bz  s390x: Fix memory corruption for multithreaded applications

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index ed10584298577169c32ca34cb470f364ffff9b03..48b437e98b0c63f5f064c92364fadcdc340ad3a4 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -6038,6 +6038,10 @@ PRE(sys_ioctl)
       //tst->sys_flags &= ~SfMayBlock;
       break;
 
+    case VKI_SIOCATMARK:
+      PRE_MEM_READ( "ioctl(SIOCATMARK)", ARG3, sizeof(int) );
+      break;
+
       /* linux/soundcard interface (OSS) */
    case VKI_SNDCTL_SEQ_GETOUTCOUNT:
    case VKI_SNDCTL_SEQ_GETINCOUNT:
@@ -7414,6 +7418,10 @@ POST(sys_ioctl)
    case VKI_SIOCSPGRP:
       break;
 
+   case VKI_SIOCATMARK:
+      POST_MEM_WRITE(ARG3, sizeof(int));
+      break;
+
       /* linux/soundcard interface (OSS) */
    case VKI_SNDCTL_SEQ_GETOUTCOUNT:
    case VKI_SNDCTL_SEQ_GETINCOUNT:

diff --git a/docs/internals/3_9_BUGSTATUS.txt b/docs/internals/3_9_BUGSTATUS.txt
index d972bae0536bc2bb105912f48120519f9a5384cf..ca99af932fbba204da73e0ab5e42b6b9c0f1a774 100644 (file)
--- a/docs/internals/3_9_BUGSTATUS.txt
+++ b/docs/internals/3_9_BUGSTATUS.txt
@@ -179,7 +179,6 @@ For bugs reported before this time, see 3_8_BUGSTATUS.txt
 334834  PPC64 Little Endian support, patch 2
 334836  PPC64 Little Endian support, patch 3 testcase fixes
 335353  expected output of exp-sgcheck/tests/hackedbz2 mismatch with gcc 4.8.1
-335441  unhandled ioctl 0x8905 (SIOCATMARK) when running wine under valgrind (patch)
 249435  Analyzing wine programs with callgrind triggers a crash (NEEDS CLOSE)
 335563  wine's kernel32/thread test fails under valgrind
 335618  arm(thumb): unhanded instruction: mov.w rN, pc/sp

diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h
index 273b8b548b3400e5f26675e5a125002e0d8d4d56..fb65e03a807b4cc279c35532b1d58c75a7397333 100644 (file)
--- a/include/vki/vki-amd64-linux.h
+++ b/include/vki/vki-amd64-linux.h
@@ -311,6 +311,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP          0x8902
 #define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCATMARK         0x8905
 #define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h
index 84e3a2cd86304c348978a4858a734651bd9ffd19..eb12f2dbf0c85ad8da53e0571e2073b858d2c813 100644 (file)
--- a/include/vki/vki-arm-linux.h
+++ b/include/vki/vki-arm-linux.h
@@ -313,6 +313,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP           0x8902
 #define VKI_SIOCGPGRP           0x8904
+#define VKI_SIOCATMARK          0x8905
 #define VKI_SIOCGSTAMP          0x8906      /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS        0x8907      /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-arm64-linux.h b/include/vki/vki-arm64-linux.h
index 1c13105ef8d846a0449d0707a97042c064b06b58..4a16704d26f16e62cac8f5fad783ec368a221ab7 100644 (file)
--- a/include/vki/vki-arm64-linux.h
+++ b/include/vki/vki-arm64-linux.h
@@ -284,6 +284,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP          0x8902
 #define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCATMARK         0x8905
 #define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h
index c38da2df934b31649c01644601bd6a807b2fb569..a0aaea80f6fbf7ba773b5b1f1b81017c8119f185 100644 (file)
--- a/include/vki/vki-mips32-linux.h
+++ b/include/vki/vki-mips32-linux.h
@@ -382,6 +382,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP           0x8902
 #define VKI_SIOCGPGRP           0x8904
+#define VKI_SIOCATMARK          0x8905
 #define VKI_SIOCGSTAMP          0x8906      /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS        0x8907      /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h
index 4dc24134f30ddbe22ea5d922885230e0a2d9d5f8..bf49bb3275af8f38ff3992bd347b4b490cfbfeb2 100644 (file)
--- a/include/vki/vki-mips64-linux.h
+++ b/include/vki/vki-mips64-linux.h
@@ -387,6 +387,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP           0x8902
 #define VKI_SIOCGPGRP           0x8904
+#define VKI_SIOCATMARK          0x8905
 #define VKI_SIOCGSTAMP          0x8906      /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS        0x8907      /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 8eed63738be5de0b348f2d7d28a78eae5010d470..f71dae59c78acccc831be33315be9fe4019a2565 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -380,6 +380,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP          0x8902
 #define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCATMARK         0x8905
 #define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index 8db1e4ca383d198893a556578df2c362f31f70bf..d239cab6ff5ee7ab68d0dd8509a93b0356d693d5 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -431,6 +431,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP       0x8902
 #define VKI_SIOCGPGRP       0x8904
+#define VKI_SIOCATMARK      0x8905
 #define VKI_SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
 

diff --git a/include/vki/vki-s390x-linux.h b/include/vki/vki-s390x-linux.h
index 53c46f67e208e6c0467be5abfea1a914ad20b0fb..b878949856b95f59254cc6747336c0474710a453 100644 (file)
--- a/include/vki/vki-s390x-linux.h
+++ b/include/vki/vki-s390x-linux.h
@@ -377,6 +377,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP       0x8902
 #define VKI_SIOCGPGRP       0x8904
+#define VKI_SIOCATMARK      0x8905
 #define VKI_SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
 /* since 2.6.22 */
 #define VKI_SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */

diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index f23f3e4aaa2af60b914c181007f66c8d00e89f90..8f080389d246dbd581ae133566da10b7fdfdfae3 100644 (file)
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -351,6 +351,7 @@ struct vki_f_owner_ex {
 
 #define VKI_SIOCSPGRP          0x8902
 #define VKI_SIOCGPGRP          0x8904
+#define VKI_SIOCATMARK         0x8905
 #define VKI_SIOCGSTAMP         0x8906          /* Get stamp (timeval) */
 #define VKI_SIOCGSTAMPNS       0x8907          /* Get stamp (timespec) */