From: Julian Seward <jseward@acm.org>
Date: Fri, 5 Jun 2015 11:25:32 +0000 (+0000)
Subject: Bug 348728 - Fix broken check for VIDIOC_G_ENC_INDEX
X-Git-Tag: svn/VALGRIND_3_11_0~318
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4d69434b8514390e9e359a39dad288dea5ab161;p=thirdparty%2Fvalgrind.git

Bug 348728 - Fix broken check for VIDIOC_G_ENC_INDEX
Patch from Hans Verkuil (hverkuil@xs4all.nl)


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

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 640f4023a9..c042ddaf2d 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -8003,7 +8003,7 @@ PRE(sys_ioctl)
    }
    case VKI_V4L2_G_ENC_INDEX: {
       struct vki_v4l2_enc_idx *data = (struct vki_v4l2_enc_idx *)ARG3;
-      PRE_MEM_READ("ioctl(VKI_V4L2_G_ENC_INDEX)", (Addr)data, sizeof(*data));
+      PRE_MEM_WRITE("ioctl(VKI_V4L2_G_ENC_INDEX)", (Addr)data, sizeof(*data));
       break;
    }
    case VKI_V4L2_ENCODER_CMD: {
@@ -9702,7 +9702,6 @@ POST(sys_ioctl)
    case VKI_V4L2_S_JPEGCOMP:
    case VKI_V4L2_S_CROP:
    case VKI_V4L2_S_PRIORITY:
-   case VKI_V4L2_G_ENC_INDEX:
    case VKI_V4L2_S_HW_FREQ_SEEK:
    case VKI_V4L2_S_DV_TIMINGS:
    case VKI_V4L2_SUBSCRIBE_EVENT:
@@ -10018,6 +10017,11 @@ POST(sys_ioctl)
       POST_FIELD_WRITE(data->stepwise);
       break;
    }
+   case VKI_V4L2_G_ENC_INDEX: {
+      struct vki_v4l2_enc_idx *data = (struct vki_v4l2_enc_idx *)ARG3;
+      POST_MEM_WRITE((Addr)data, sizeof(*data));
+      break;
+   }
    case VKI_V4L2_ENCODER_CMD: {
       struct vki_v4l2_encoder_cmd *data = (struct vki_v4l2_encoder_cmd *)ARG3;
       POST_FIELD_WRITE(data->flags);