evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: usbaudio: Add check for NULL before dereferencing

Browse source 
kzalloc() and usb_ifnum_to_if() both APIs can return NULL. Current
code is not checking return value and derefencing which may crash
device if it is set to NULL. Fix this by checking return value
against NULL and handling the same.

CRs-Fixed: 562273
Change-Id: I0d2c910f43321e94fc447b19ae3e3207727e24f3
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
This commit is contained in:
Mayank Rana 2013-10-18 14:46:36 +05:30 • committed by David Keitel
parent c336ae90fa
commit f18c9be9d4
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/usb/card.c
View file

@ -216,11 +216,24 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
struct usb_device *dev = chip->dev; struct usb_device *dev = chip->dev;
struct usb_host_interface *host_iface; struct usb_host_interface *host_iface;
struct usb_interface_descriptor *altsd; struct usb_interface_descriptor *altsd;
struct usb_interface *usb_iface;
void *control_header; void *control_header;
int i, protocol; int i, protocol;
usb_iface = usb_ifnum_to_if(dev, ctrlif);
if (!usb_iface) {
snd_printk(KERN_ERR "%d:%u : does not exist\n",
dev->devnum, ctrlif);
return -EINVAL;
}
/* find audiocontrol interface */ /* find audiocontrol interface */
host_iface = &usb_ifnum_to_if(dev, ctrlif)->altsetting[0]; host_iface = &usb_iface->altsetting[0];
if (!host_iface) {
snd_printk(KERN_ERR "Audio Control interface is not available.");
return -EINVAL;
}
control_header = snd_usb_find_csint_desc(host_iface->extra, control_header = snd_usb_find_csint_desc(host_iface->extra,
host_iface->extralen, host_iface->extralen,
NULL, UAC_HEADER); NULL, UAC_HEADER);
@ -260,8 +273,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
case UAC_VERSION_2: { case UAC_VERSION_2: {
struct usb_interface_assoc_descriptor *assoc = struct usb_interface_assoc_descriptor *assoc =
usb_ifnum_to_if(dev, ctrlif)->intf_assoc; usb_iface->intf_assoc;
if (!assoc) { if (!assoc) {
/* /*
* Firmware writers cannot count to three. So to find * Firmware writers cannot count to three. So to find