mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 06:04:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l: subdev: Return NULL from pad access functions on error

Browse Source 
Return NULL from sub-device pad state access functions
(v4l2_subdev_state_get_{format,crop,compose}) for non-existent pads. While
this behaviour differs from older set of pad state information access
functions, we've had a WARN_ON() there for a long time and callers also do
validate the pad index nowadays. Therefore problems are not expected.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Sakari Ailus
2023-10-25 12:22:56 +02:00
committed by Mauro Carvalho Chehab
parent 34dfd1dd52
commit 3591c53ae9
1 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/v4l2-core/v4l2-subdev.c
View File

@@ -1545,16 +1545,8 @@ __v4l2_subdev_state_get_format(struct v4l2_subdev_state *state,
if (stream)
return NULL;
/*
* Set the pad to 0 on error as this is aligned with the
* behaviour of the pad state information access functions. The
* purpose of setting pad to 0 here is to avoid accessing memory
* outside the pads array, but still issuing warning of the
* invalid access while making the caller's error handling
* easier.
*/
if (WARN_ON_ONCE(pad >= state->sd->entity.num_pads))
pad = 0;
if (pad >= state->sd->entity.num_pads)
return NULL;
return &state->pads[pad].format;
}
@@ -1587,16 +1579,8 @@ __v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
if (stream)
return NULL;
/*
* Set the pad to 0 on error as this is aligned with the
* behaviour of the pad state information access functions. The
* purpose of setting pad to 0 here is to avoid accessing memory
* outside the pads array, but still issuing warning of the
* invalid access while making the caller's error handling
* easier.
*/
if (WARN_ON_ONCE(pad >= state->sd->entity.num_pads))
pad = 0;
if (pad >= state->sd->entity.num_pads)
return NULL;
return &state->pads[pad].crop;
}
@@ -1629,16 +1613,8 @@ __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state,
if (stream)
return NULL;
/*
* Set the pad to 0 on error as this is aligned with the
* behaviour of the pad state information access functions. The
* purpose of setting pad to 0 here is to avoid accessing memory
* outside the pads array, but still issuing warning of the
* invalid access while making the caller's error handling
* easier.
*/
if (WARN_ON_ONCE(pad >= state->sd->entity.num_pads))
pad = 0;
if (pad >= state->sd->entity.num_pads)
return NULL;
return &state->pads[pad].compose;
}