diff options
| author | Ricardo Ribalda <ribalda@chromium.org> | 2021-12-01 06:22:18 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-12-07 11:29:54 +0100 |
| commit | 414d3b49d9fd4a0bb16a13d929027847fd094f3f (patch) | |
| tree | 3961ff4e811a5864f027485cde0ad99d1baab27f /drivers/media/usb | |
| parent | f0577b1b6394f954903fcc67e12fe9e7001dafd6 (diff) | |
| download | linux-stable-414d3b49d9fd4a0bb16a13d929027847fd094f3f.tar.gz linux-stable-414d3b49d9fd4a0bb16a13d929027847fd094f3f.tar.bz2 linux-stable-414d3b49d9fd4a0bb16a13d929027847fd094f3f.zip | |
media: uvcvideo: Avoid returning invalid controls
If the memory where ctrl_found is placed has the value of uvc_ctrl and
__uvc_find_control does not find the control we will return an invalid
index.
Fixes: 6350d6a4ed487 ("media: uvcvideo: Set error_idx during ctrl_commit errors")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 9a25d6029255..b4f6edf968bc 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1639,7 +1639,7 @@ static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, struct uvc_control *uvc_control) { struct uvc_control_mapping *mapping = NULL; - struct uvc_control *ctrl_found; + struct uvc_control *ctrl_found = NULL; unsigned int i; if (!entity) |