From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v3 3/8] media: uvcvideo: Allow entities with no pads
Date: Thu, 19 Nov 2020 22:50:15 +0100 [thread overview]
Message-ID: <20201119215020.508487-4-ribalda@chromium.org> (raw)
In-Reply-To: <20201119215020.508487-1-ribalda@chromium.org>
Avoid an underflow while calculating the number of inputs for entities
with zero pads.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_driver.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 9f4451a2e0a6..534629ecd60d 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1033,7 +1033,11 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id,
unsigned int i;
extra_size = roundup(extra_size, sizeof(*entity->pads));
- num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1;
+ if (num_pads)
+ num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads :
+ num_pads - 1;
+ else
+ num_inputs = 0;
size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads
+ num_inputs;
entity = kzalloc(size, GFP_KERNEL);
@@ -1066,7 +1070,7 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id,
for (i = 0; i < num_inputs; ++i)
entity->pads[i].flags = MEDIA_PAD_FL_SINK;
- if (!UVC_ENTITY_IS_OTERM(entity))
+ if (!UVC_ENTITY_IS_OTERM(entity) && num_pads)
entity->pads[num_pads-1].flags = MEDIA_PAD_FL_SOURCE;
entity->bNrInPins = num_inputs;
--
2.29.2.299.gdc1121823c-goog
next prev parent reply other threads:[~2020-11-19 21:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 21:50 [PATCH v3 0/8] Show privacy_gpio as a v4l2_ctrl Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 1/8] media: uvcvideo: Move guid to entity Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 2/8] media: uvcvideo: Allow external entities Ricardo Ribalda
2020-11-19 21:50 ` Ricardo Ribalda [this message]
2020-11-19 21:50 ` [PATCH v3 4/8] media: uvcvideo: Entity defined get_info and get_cur Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 5/8] media: uvcvideo: Implement UVC_EXT_GPIO_UNIT Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 6/8] media: uvcvideo: Add Privacy control based on EXT_GPIO Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 7/8] media: uvcvideo: Use dev_ printk aliases Ricardo Ribalda
2020-11-19 21:50 ` [PATCH v3 8/8] media: uvcvideo: New macro uvc_trace_cont Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201119215020.508487-4-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).