media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs
authorHans Verkuil <hansverk@cisco.com>
Tue, 30 Jan 2018 15:18:32 +0000 (10:18 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 31 Jan 2018 08:09:04 +0000 (03:09 -0500)
If the device is of type VFL_TYPE_SUBDEV then vdev->ioctl_ops
is NULL so the 'if (!ops->vidioc_query_ext_ctrl)' check would crash.
Add a test for !ops to the condition.

All sub-devices that have controls will use the control framework,
so they do not have an equivalent to ops->vidioc_query_ext_ctrl.
Returning false if ops is NULL is the correct thing to do here.

Fixes: b8c601e8af ("v4l2-compat-ioctl32.c: fix ctrl_is_pointer")

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: <stable@vger.kernel.org> # for v4.15 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/v4l2-core/v4l2-compat-ioctl32.c

index bdb5c22..5198c9e 100644 (file)
@@ -770,7 +770,7 @@ static inline bool ctrl_is_pointer(struct file *file, u32 id)
                return ctrl && ctrl->is_ptr;
        }
 
-       if (!ops->vidioc_query_ext_ctrl)
+       if (!ops || !ops->vidioc_query_ext_ctrl)
                return false;
 
        return !ops->vidioc_query_ext_ctrl(file, fh, &qec) &&