From: Johan Hovold <johan@kernel.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>, stable <stable@vger.kernel.org>,
Hans de Goede <hdegoede@redhat.com>
Subject: [PATCH 6/6] [media] gspca: konica: add missing endpoint sanity check
Date: Mon, 13 Mar 2017 13:53:59 +0100 [thread overview]
Message-ID: <20170313125359.29394-7-johan@kernel.org> (raw)
In-Reply-To: <20170313125359.29394-1-johan@kernel.org>
Make sure to check the number of endpoints to avoid accessing memory
beyond the endpoint array should a device lack the expected endpoints.
Note that, as far as I can tell, the gspca framework has already made
sure there is at least one endpoint in the current alternate setting so
there should be no risk for a NULL-pointer dereference here.
Fixes: b517af722860 ("V4L/DVB: gspca_konica: New gspca subdriver for
konica chipset using cams")
Cc: stable <stable@vger.kernel.org> # 2.6.37
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/media/usb/gspca/konica.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/usb/gspca/konica.c b/drivers/media/usb/gspca/konica.c
index 71f273377f83..31b2117e8f1d 100644
--- a/drivers/media/usb/gspca/konica.c
+++ b/drivers/media/usb/gspca/konica.c
@@ -184,6 +184,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
return -EIO;
}
+ if (alt->desc.bNumEndpoints < 2)
+ return -ENODEV;
+
packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize);
n = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
--
2.12.0
next prev parent reply other threads:[~2017-03-13 12:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 12:53 [PATCH 0/6] [media] fix missing endpoint sanity checks Johan Hovold
2017-03-13 12:53 ` [PATCH 1/6] [media] dib0700: fix NULL-deref at probe Johan Hovold
2017-03-13 12:53 ` [PATCH 2/6] [media] usbvision: " Johan Hovold
2017-03-13 12:53 ` [PATCH 3/6] [media] cx231xx-cards: " Johan Hovold
2017-03-13 12:53 ` [PATCH 4/6] [media] cx231xx-audio: fix init error path Johan Hovold
2017-03-13 12:53 ` [PATCH 5/6] [media] cx231xx-audio: fix NULL-deref at probe Johan Hovold
2017-03-13 12:53 ` Johan Hovold [this message]
2017-04-03 8:30 ` [PATCH 0/6] [media] fix missing endpoint sanity checks Johan Hovold
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=20170313125359.29394-7-johan@kernel.org \
--to=johan@kernel.org \
--cc=hdegoede@redhat.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=stable@vger.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