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

staging: line6: toneport.c: Fix for possible null pointer dereference

Browse source 
The NULL check was done to late, and there it was a risk
of a possible null pointer dereference.

This was partially found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rickard Strandqvist 2015-01-12 12:42:34 -08:00 • committed by Takashi Iwai
parent eaa27f34e9
commit a248ce068f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/line6/toneport.c
View file

@ -433,12 +433,16 @@ void line6_toneport_reset_resume(struct usb_line6_toneport *toneport)
void line6_toneport_disconnect(struct usb_interface *interface) void line6_toneport_disconnect(struct usb_interface *interface)
{ {
struct usb_line6_toneport *toneport; struct usb_line6_toneport *toneport;
struct snd_line6_pcm *line6pcm;
u16 idProduct; u16 idProduct;
if (interface == NULL) if (interface == NULL)
return; return;
toneport = usb_get_intfdata(interface); toneport = usb_get_intfdata(interface);
if (NULL == toneport)
return;
del_timer_sync(&toneport->timer); del_timer_sync(&toneport->timer);
idProduct = le16_to_cpu(toneport->line6.usbdev->descriptor.idProduct); idProduct = le16_to_cpu(toneport->line6.usbdev->descriptor.idProduct);
@ -447,13 +451,10 @@ void line6_toneport_disconnect(struct usb_interface *interface)
device_remove_file(&interface->dev, &dev_attr_led_green); device_remove_file(&interface->dev, &dev_attr_led_green);
} }
if (toneport != NULL) { line6pcm = toneport->line6.line6pcm;
struct snd_line6_pcm *line6pcm = toneport->line6.line6pcm; if (line6pcm != NULL) {
line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);
if (line6pcm != NULL) { line6_pcm_disconnect(line6pcm);
line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);
line6_pcm_disconnect(line6pcm);
}
} }
toneport_destruct(interface); toneport_destruct(interface);