Commit 65f92164 authored by Johan Hovold's avatar Johan Hovold Committed by Mauro Carvalho Chehab

[media] cx231xx-audio: fix NULL-deref at probe

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

Fixes: e0d3bafd ("V4L/DVB (10954): Add cx231xx USB driver")

Cc: stable <stable@vger.kernel.org>     # 2.6.30
Cc: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent fff1abc4
...@@ -697,6 +697,11 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -697,6 +697,11 @@ static int cx231xx_audio_init(struct cx231xx *dev)
hs_config_info[0].interface_info. hs_config_info[0].interface_info.
audio_index + 1]; audio_index + 1];
if (uif->altsetting[0].desc.bNumEndpoints < isoc_pipe + 1) {
err = -ENODEV;
goto err_free_card;
}
adev->end_point_addr = adev->end_point_addr =
uif->altsetting[0].endpoint[isoc_pipe].desc. uif->altsetting[0].endpoint[isoc_pipe].desc.
bEndpointAddress; bEndpointAddress;
...@@ -712,8 +717,14 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -712,8 +717,14 @@ static int cx231xx_audio_init(struct cx231xx *dev)
} }
for (i = 0; i < adev->num_alt; i++) { for (i = 0; i < adev->num_alt; i++) {
u16 tmp = u16 tmp;
le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
if (uif->altsetting[i].desc.bNumEndpoints < isoc_pipe + 1) {
err = -ENODEV;
goto err_free_pkt_size;
}
tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.
wMaxPacketSize); wMaxPacketSize);
adev->alt_max_pkt_size[i] = adev->alt_max_pkt_size[i] =
(tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1); (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
...@@ -724,6 +735,8 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -724,6 +735,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
return 0; return 0;
err_free_pkt_size:
kfree(adev->alt_max_pkt_size);
err_free_card: err_free_card:
snd_card_free(card); snd_card_free(card);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment