media: v4l2-core: compat: ignore native command codes

The do_video_ioctl() compat handler converts the compat command
codes into the native ones before processing further, but this
causes problems for 32-bit user applications that pass a command
code that matches a 64-bit native number, which will then be
handled the same way.

Specifically, this breaks VIDIOC_DQEVENT_TIME from user space
applications with 64-bit time_t, as the structure layout is
the same as the native 64-bit layout on many architectures
(x86 being the notable exception).

Change the handler to use the converted command code only for
passing into the native ioctl handler, not for deciding on the
conversion, in order to make the compat behavior match the
native behavior.

Actual support for the 64-bit time_t version of VIDIOC_DQEVENT_TIME
and other commands still needs to be added in a separate patch.

Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index e1eaf1135c7f88d3a09a7b7d26dd027b50e4cbc5..7ad6db8dd9f6f15bfb5f66d36a9c5cfce8faecfb 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -1183,36 +1183,38 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
        u32 aux_space;
        int compatible_arg = 1;
        long err = 0;
+       unsigned int ncmd;
 
        /*
         * 1. When struct size is different, converts the command.
         */
        switch (cmd) {
-       case VIDIOC_G_FMT32: cmd = VIDIOC_G_FMT; break;
-       case VIDIOC_S_FMT32: cmd = VIDIOC_S_FMT; break;
-       case VIDIOC_QUERYBUF32: cmd = VIDIOC_QUERYBUF; break;
-       case VIDIOC_G_FBUF32: cmd = VIDIOC_G_FBUF; break;
-       case VIDIOC_S_FBUF32: cmd = VIDIOC_S_FBUF; break;
-       case VIDIOC_QBUF32: cmd = VIDIOC_QBUF; break;
-       case VIDIOC_DQBUF32: cmd = VIDIOC_DQBUF; break;
-       case VIDIOC_ENUMSTD32: cmd = VIDIOC_ENUMSTD; break;
-       case VIDIOC_ENUMINPUT32: cmd = VIDIOC_ENUMINPUT; break;
-       case VIDIOC_TRY_FMT32: cmd = VIDIOC_TRY_FMT; break;
-       case VIDIOC_G_EXT_CTRLS32: cmd = VIDIOC_G_EXT_CTRLS; break;
-       case VIDIOC_S_EXT_CTRLS32: cmd = VIDIOC_S_EXT_CTRLS; break;
-       case VIDIOC_TRY_EXT_CTRLS32: cmd = VIDIOC_TRY_EXT_CTRLS; break;
-       case VIDIOC_DQEVENT32: cmd = VIDIOC_DQEVENT; break;
-       case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break;
-       case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break;
-       case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break;
-       case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break;
-       case VIDIOC_S_INPUT32: cmd = VIDIOC_S_INPUT; break;
-       case VIDIOC_G_OUTPUT32: cmd = VIDIOC_G_OUTPUT; break;
-       case VIDIOC_S_OUTPUT32: cmd = VIDIOC_S_OUTPUT; break;
-       case VIDIOC_CREATE_BUFS32: cmd = VIDIOC_CREATE_BUFS; break;
-       case VIDIOC_PREPARE_BUF32: cmd = VIDIOC_PREPARE_BUF; break;
-       case VIDIOC_G_EDID32: cmd = VIDIOC_G_EDID; break;
-       case VIDIOC_S_EDID32: cmd = VIDIOC_S_EDID; break;
+       case VIDIOC_G_FMT32: ncmd = VIDIOC_G_FMT; break;
+       case VIDIOC_S_FMT32: ncmd = VIDIOC_S_FMT; break;
+       case VIDIOC_QUERYBUF32: ncmd = VIDIOC_QUERYBUF; break;
+       case VIDIOC_G_FBUF32: ncmd = VIDIOC_G_FBUF; break;
+       case VIDIOC_S_FBUF32: ncmd = VIDIOC_S_FBUF; break;
+       case VIDIOC_QBUF32: ncmd = VIDIOC_QBUF; break;
+       case VIDIOC_DQBUF32: ncmd = VIDIOC_DQBUF; break;
+       case VIDIOC_ENUMSTD32: ncmd = VIDIOC_ENUMSTD; break;
+       case VIDIOC_ENUMINPUT32: ncmd = VIDIOC_ENUMINPUT; break;
+       case VIDIOC_TRY_FMT32: ncmd = VIDIOC_TRY_FMT; break;
+       case VIDIOC_G_EXT_CTRLS32: ncmd = VIDIOC_G_EXT_CTRLS; break;
+       case VIDIOC_S_EXT_CTRLS32: ncmd = VIDIOC_S_EXT_CTRLS; break;
+       case VIDIOC_TRY_EXT_CTRLS32: ncmd = VIDIOC_TRY_EXT_CTRLS; break;
+       case VIDIOC_DQEVENT32: ncmd = VIDIOC_DQEVENT; break;
+       case VIDIOC_OVERLAY32: ncmd = VIDIOC_OVERLAY; break;
+       case VIDIOC_STREAMON32: ncmd = VIDIOC_STREAMON; break;
+       case VIDIOC_STREAMOFF32: ncmd = VIDIOC_STREAMOFF; break;
+       case VIDIOC_G_INPUT32: ncmd = VIDIOC_G_INPUT; break;
+       case VIDIOC_S_INPUT32: ncmd = VIDIOC_S_INPUT; break;
+       case VIDIOC_G_OUTPUT32: ncmd = VIDIOC_G_OUTPUT; break;
+       case VIDIOC_S_OUTPUT32: ncmd = VIDIOC_S_OUTPUT; break;
+       case VIDIOC_CREATE_BUFS32: ncmd = VIDIOC_CREATE_BUFS; break;
+       case VIDIOC_PREPARE_BUF32: ncmd = VIDIOC_PREPARE_BUF; break;
+       case VIDIOC_G_EDID32: ncmd = VIDIOC_G_EDID; break;
+       case VIDIOC_S_EDID32: ncmd = VIDIOC_S_EDID; break;
+       default: ncmd = cmd; break;
        }
 
        /*
@@ -1221,11 +1223,11 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
         * argument into it.
         */
        switch (cmd) {
-       case VIDIOC_OVERLAY:
-       case VIDIOC_STREAMON:
-       case VIDIOC_STREAMOFF:
-       case VIDIOC_S_INPUT:
-       case VIDIOC_S_OUTPUT:
+       case VIDIOC_OVERLAY32:
+       case VIDIOC_STREAMON32:
+       case VIDIOC_STREAMOFF32:
+       case VIDIOC_S_INPUT32:
+       case VIDIOC_S_OUTPUT32:
                err = alloc_userspace(sizeof(unsigned int), 0, &new_p64);
                if (!err && assign_in_user((unsigned int __user *)new_p64,
                                           (compat_uint_t __user *)p32))
@@ -1233,23 +1235,23 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_G_INPUT:
-       case VIDIOC_G_OUTPUT:
+       case VIDIOC_G_INPUT32:
+       case VIDIOC_G_OUTPUT32:
                err = alloc_userspace(sizeof(unsigned int), 0, &new_p64);
                compatible_arg = 0;
                break;
 
-       case VIDIOC_G_EDID:
-       case VIDIOC_S_EDID:
+       case VIDIOC_G_EDID32:
+       case VIDIOC_S_EDID32:
                err = alloc_userspace(sizeof(struct v4l2_edid), 0, &new_p64);
                if (!err)
                        err = get_v4l2_edid32(new_p64, p32);
                compatible_arg = 0;
                break;
 
-       case VIDIOC_G_FMT:
-       case VIDIOC_S_FMT:
-       case VIDIOC_TRY_FMT:
+       case VIDIOC_G_FMT32:
+       case VIDIOC_S_FMT32:
+       case VIDIOC_TRY_FMT32:
                err = bufsize_v4l2_format(p32, &aux_space);
                if (!err)
                        err = alloc_userspace(sizeof(struct v4l2_format),
@@ -1262,7 +1264,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_CREATE_BUFS:
+       case VIDIOC_CREATE_BUFS32:
                err = bufsize_v4l2_create(p32, &aux_space);
                if (!err)
                        err = alloc_userspace(sizeof(struct v4l2_create_buffers),
@@ -1275,10 +1277,10 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_PREPARE_BUF:
-       case VIDIOC_QUERYBUF:
-       case VIDIOC_QBUF:
-       case VIDIOC_DQBUF:
+       case VIDIOC_PREPARE_BUF32:
+       case VIDIOC_QUERYBUF32:
+       case VIDIOC_QBUF32:
+       case VIDIOC_DQBUF32:
                err = bufsize_v4l2_buffer(p32, &aux_space);
                if (!err)
                        err = alloc_userspace(sizeof(struct v4l2_buffer),
@@ -1291,7 +1293,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_S_FBUF:
+       case VIDIOC_S_FBUF32:
                err = alloc_userspace(sizeof(struct v4l2_framebuffer), 0,
                                      &new_p64);
                if (!err)
@@ -1299,13 +1301,13 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_G_FBUF:
+       case VIDIOC_G_FBUF32:
                err = alloc_userspace(sizeof(struct v4l2_framebuffer), 0,
                                      &new_p64);
                compatible_arg = 0;
                break;
 
-       case VIDIOC_ENUMSTD:
+       case VIDIOC_ENUMSTD32:
                err = alloc_userspace(sizeof(struct v4l2_standard), 0,
                                      &new_p64);
                if (!err)
@@ -1313,16 +1315,16 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                compatible_arg = 0;
                break;
 
-       case VIDIOC_ENUMINPUT:
+       case VIDIOC_ENUMINPUT32:
                err = alloc_userspace(sizeof(struct v4l2_input), 0, &new_p64);
                if (!err)
                        err = get_v4l2_input32(new_p64, p32);
                compatible_arg = 0;
                break;
 
-       case VIDIOC_G_EXT_CTRLS:
-       case VIDIOC_S_EXT_CTRLS:
-       case VIDIOC_TRY_EXT_CTRLS:
+       case VIDIOC_G_EXT_CTRLS32:
+       case VIDIOC_S_EXT_CTRLS32:
+       case VIDIOC_TRY_EXT_CTRLS32:
                err = bufsize_v4l2_ext_controls(p32, &aux_space);
                if (!err)
                        err = alloc_userspace(sizeof(struct v4l2_ext_controls),
@@ -1334,7 +1336,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
                }
                compatible_arg = 0;
                break;
-       case VIDIOC_DQEVENT:
+       case VIDIOC_DQEVENT32:
                err = alloc_userspace(sizeof(struct v4l2_event), 0, &new_p64);
                compatible_arg = 0;
                break;
@@ -1352,9 +1354,9 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
         * Otherwise, it will pass the newly allocated @new_p64 argument.
         */
        if (compatible_arg)
-               err = native_ioctl(file, cmd, (unsigned long)p32);
+               err = native_ioctl(file, ncmd, (unsigned long)p32);
        else
-               err = native_ioctl(file, cmd, (unsigned long)new_p64);
+               err = native_ioctl(file, ncmd, (unsigned long)new_p64);
 
        if (err == -ENOTTY)
                return err;
@@ -1370,13 +1372,13 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
         * the blocks to maximum allowed value.
         */
        switch (cmd) {
-       case VIDIOC_G_EXT_CTRLS:
-       case VIDIOC_S_EXT_CTRLS:
-       case VIDIOC_TRY_EXT_CTRLS:
+       case VIDIOC_G_EXT_CTRLS32:
+       case VIDIOC_S_EXT_CTRLS32:
+       case VIDIOC_TRY_EXT_CTRLS32:
                if (put_v4l2_ext_controls32(file, new_p64, p32))
                        err = -EFAULT;
                break;
-       case VIDIOC_S_EDID:
+       case VIDIOC_S_EDID32:
                if (put_v4l2_edid32(new_p64, p32))
                        err = -EFAULT;
                break;
@@ -1389,49 +1391,49 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
         * the original 32 bits structure.
         */
        switch (cmd) {
-       case VIDIOC_S_INPUT:
-       case VIDIOC_S_OUTPUT:
-       case VIDIOC_G_INPUT:
-       case VIDIOC_G_OUTPUT:
+       case VIDIOC_S_INPUT32:
+       case VIDIOC_S_OUTPUT32:
+       case VIDIOC_G_INPUT32:
+       case VIDIOC_G_OUTPUT32:
                if (assign_in_user((compat_uint_t __user *)p32,
                                   ((unsigned int __user *)new_p64)))
                        err = -EFAULT;
                break;
 
-       case VIDIOC_G_FBUF:
+       case VIDIOC_G_FBUF32:
                err = put_v4l2_framebuffer32(new_p64, p32);
                break;
 
-       case VIDIOC_DQEVENT:
+       case VIDIOC_DQEVENT32:
                err = put_v4l2_event32(new_p64, p32);
                break;
 
-       case VIDIOC_G_EDID:
+       case VIDIOC_G_EDID32:
                err = put_v4l2_edid32(new_p64, p32);
                break;
 
-       case VIDIOC_G_FMT:
-       case VIDIOC_S_FMT:
-       case VIDIOC_TRY_FMT:
+       case VIDIOC_G_FMT32:
+       case VIDIOC_S_FMT32:
+       case VIDIOC_TRY_FMT32:
                err = put_v4l2_format32(new_p64, p32);
                break;
 
-       case VIDIOC_CREATE_BUFS:
+       case VIDIOC_CREATE_BUFS32:
                err = put_v4l2_create32(new_p64, p32);
                break;
 
-       case VIDIOC_PREPARE_BUF:
-       case VIDIOC_QUERYBUF:
-       case VIDIOC_QBUF:
-       case VIDIOC_DQBUF:
+       case VIDIOC_PREPARE_BUF32:
+       case VIDIOC_QUERYBUF32:
+       case VIDIOC_QBUF32:
+       case VIDIOC_DQBUF32:
                err = put_v4l2_buffer32(new_p64, p32);
                break;
 
-       case VIDIOC_ENUMSTD:
+       case VIDIOC_ENUMSTD32:
                err = put_v4l2_standard32(new_p64, p32);
                break;
 
-       case VIDIOC_ENUMINPUT:
+       case VIDIOC_ENUMINPUT32:
                err = put_v4l2_input32(new_p64, p32);
                break;
        }