[git:media_tree/master] [media] gspca: konica: add missing endpoint sanity check

[git:media_tree/master] [media] gspca: konica: add missing endpoint sanity check

[Mauro Carvalho Chehab]

This is an automatic generated email to let you know that the following patch were queued:

Subject: [media] gspca: konica: add missing endpoint sanity check
Author:  Johan Hovold <johan@kernel.org>
Date:    Mon Mar 13 09:53:59 2017 -0300

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>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

 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;

Re: [git:media_tree/master] [media] gspca: konica: add missing endpoint sanity check

[Johan Hovold]

On Wed, Apr 05, 2017 at 06:07:31PM +0000, Mauro Carvalho Chehab wrote:
> This is an automatic generated email to let you know that the
> following patch were queued:
> 
> Subject: [media] gspca: konica: add missing endpoint sanity check
> Author:  Johan Hovold <johan@kernel.org>
> Date:    Mon Mar 13 09:53:59 2017 -0300

This was the sixth and final patch in a series; are you picking up the
first five as well?

Thanks,
Johan

Re: [git:media_tree/master] [media] gspca: konica: add missing endpoint sanity check

[Hans Verkuil]

On 04/10/2017 10:18 AM, Johan Hovold wrote:
> On Wed, Apr 05, 2017 at 06:07:31PM +0000, Mauro Carvalho Chehab wrote:
>> This is an automatic generated email to let you know that the
>> following patch were queued:
>>
>> Subject: [media] gspca: konica: add missing endpoint sanity check
>> Author:  Johan Hovold <johan@kernel.org>
>> Date:    Mon Mar 13 09:53:59 2017 -0300
> 
> This was the sixth and final patch in a series; are you picking up the
> first five as well?

Yes. Those are in another pull request that hasn't been merged yet.

I've no idea why this patch ended up in a different pull request from the
others.

Regards,

	Hans