Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8465657a authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs 



commit 273caa260035c03d89ad63d72d8cd3d9e5c5e3f1 upstream.

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reported-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a7cd41b

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

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,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) &&