| From 4445e0c3098c38ce51d6a30d2c529477bc8f2ac4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Sep 2022 16:04:55 +0200 |
| Subject: media: uvcvideo: Handle cameras with invalid descriptors |
| |
| From: Ricardo Ribalda <ribalda@chromium.org> |
| |
| [ Upstream commit 41ddb251c68ac75c101d3a50a68c4629c9055e4c ] |
| |
| If the source entity does not contain any pads, do not create a link. |
| |
| Reported-by: syzbot <syzkaller@googlegroups.com> |
| Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/usb/uvc/uvc_entity.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c |
| index 7c4d2f93d3513..cc68dd24eb42d 100644 |
| --- a/drivers/media/usb/uvc/uvc_entity.c |
| +++ b/drivers/media/usb/uvc/uvc_entity.c |
| @@ -37,7 +37,7 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain, |
| continue; |
| |
| remote = uvc_entity_by_id(chain->dev, entity->baSourceID[i]); |
| - if (remote == NULL) |
| + if (remote == NULL || remote->num_pads == 0) |
| return -EINVAL; |
| |
| source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) |
| -- |
| 2.39.2 |
| |
