media: v4l2-compat-ioctl32.c: add missing VIDIOC_PREPARE_BUF 78/175678/1
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 24 Jan 2018 13:37:04 +0000 (08:37 -0500)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 11 Apr 2018 10:11:24 +0000 (19:11 +0900)
commit 3ee6d040719ae09110e5cdf24d5386abe5d1b776 upstream.

The result of the VIDIOC_PREPARE_BUF ioctl was never copied back
to userspace since it was missing in the switch.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: <stable@vger.kernel.org> # for v4.15 and up
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick from linux-3.18.y to apply CVE patch]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I46cfe614d06f3e5885e29f8e07f0196398fb837c

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

index 5e03214e1ade783e6ea13ed4c0d35b3298be0c6d..67b15b84b8531af4d735ac2e0457ff76f2bf02d9 100644 (file)
@@ -1000,6 +1000,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                err = put_v4l2_create32(&karg.v2crt, up);
                break;
 
+       case VIDIOC_PREPARE_BUF:
        case VIDIOC_QUERYBUF:
        case VIDIOC_QBUF:
        case VIDIOC_DQBUF: