media: v4l2-core: return -ENODEV from ioctl when not registered
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Jun 2021 10:34:06 +0000 (12:34 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 17 Jun 2021 08:17:01 +0000 (10:17 +0200)
I spotted a minor difference is handling of unregistered devices
between native and compat ioctls: the native handler never tries
to call into the driver if a device is not marked as registered.

I did not check whether this can cause issues in the kernel, or
just a different between return codes, but it clearly makes
sense that both should behave the same way.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/v4l2-core/v4l2-compat-ioctl32.c

index 0ca75f6..47aff3b 100644 (file)
@@ -1244,6 +1244,9 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
        if (!file->f_op->unlocked_ioctl)
                return ret;
 
+       if (!video_is_registered(vdev))
+               return -ENODEV;
+
        if (_IOC_TYPE(cmd) == 'V' && _IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)
                ret = file->f_op->unlocked_ioctl(file, cmd,
                                        (unsigned long)compat_ptr(arg));