On 02/07/2018 03:39 PM, Hans Verkuil wrote:
> From: Hans Verkuil <hansverk@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Reported-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # for v4.15 and up
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> index bdb5c226d01c..5198c9eeb348 100644
> --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> @@ -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) &&
>
Oops, ignore this one. Obviously not part of the patch series.
Hans