iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: v4l: subdev: Copy argument back to user also for S_ROUTING

Browse Source 
As the user needs to know what went wrong for S_ROUTING, copy array
arguments back to the user.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Julien Massot <julien.massot@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Sakari Ailus 2023-08-31 14:40:29 +03:00 committed by Hans Verkuil
parent 72364b91ce
commit 38c84932de
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -3461,11 +3461,14 @@ video_usercopy(struct file *file, unsigned int orig_cmd, unsigned long arg,
* FIXME: subdev IOCTLS are partially handled here and partially in
* v4l2-subdev.c and the 'always_copy' flag can only be set for IOCTLS
* defined here as part of the 'v4l2_ioctls' array. As
* VIDIOC_SUBDEV_G_ROUTING needs to return results to applications even
* in case of failure, but it is not defined here as part of the
* VIDIOC_SUBDEV_[GS]_ROUTING needs to return results to applications
* even in case of failure, but it is not defined here as part of the
* 'v4l2_ioctls' array, insert an ad-hoc check to address that.
*/
if (err < 0 && !always_copy && cmd != VIDIOC_SUBDEV_G_ROUTING)
if (cmd == VIDIOC_SUBDEV_G_ROUTING || cmd == VIDIOC_SUBDEV_S_ROUTING)
always_copy = true;
if (err < 0 && !always_copy)
goto out;
if (has_array_args) {