Handle FIOCLEX and FIONCLEX ioctls. Patch from Ben Noordhuis. BZ#305170.

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

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index e73c9855d82bb9b7d5a346176ca038b2f19317da..7d09c13650cbea02a45d03b35d2cd1b7ff4bb197 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -5262,6 +5262,10 @@ PRE(sys_ioctl)
    // scalar/non-pointer argument).
    switch (ARG2 /* request */) {
 
+      /* asm-generic/ioctls.h */
+   case VKI_FIOCLEX:
+   case VKI_FIONCLEX:
+
       /* linux/soundcard interface (ALSA) */
    case VKI_SNDRV_PCM_IOCTL_HW_FREE:
    case VKI_SNDRV_PCM_IOCTL_HWSYNC:
@@ -6801,6 +6805,10 @@ POST(sys_ioctl)
       break;
    case VKI_FIONBIO:
       break;
+   case VKI_FIONCLEX:
+      break;
+   case VKI_FIOCLEX:
+      break;
    case VKI_FIOASYNC:
       break;
    case VKI_FIONREAD:                /* identical to SIOCINQ */

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index 63cd50149ee82c77eee02d44fb2712b495b9a2d6..b21c6e8d1eb73c5c8e98f711819c6c1c4f5332e2 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -2860,6 +2860,9 @@ struct vki_getcpu_cache {
 // From linux-2.6.39-rc2/include/asm_generic/ioctls.h
 //----------------------------------------------------------------------
 
+#define VKI_FIONCLEX        0x5450
+#define VKI_FIOCLEX         0x5451
+
 #ifndef VKI_FIOQSIZE
 #define VKI_FIOQSIZE 0x5460     /* Value differs on some platforms */
 #endif