ALSA: sound/pci/pcxhr/pcxhr.c: introduce missing kfree and pci_disable_device
Error handling code following a kzalloc should free the allocated data. The error handling code is adjusted to call pci_disable_device(pci); as well, as done later in the function The semantic match that finds the problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,l; position p1,p2; expression *ptr != NULL; @@ ( if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S | x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S ) <... when != x when != if (...) { <+...x...+> } x->f = E ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
0f101fa6bc
commit
d6f35e3f0d
|
@ -1229,8 +1229,11 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST))
|
||||
if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST)) {
|
||||
kfree(mgr);
|
||||
pci_disable_device(pci);
|
||||
return -ENODEV;
|
||||
}
|
||||
card_name = pcxhr_board_params[pci_id->driver_data].board_name;
|
||||
mgr->playback_chips = pcxhr_board_params[pci_id->driver_data].playback_chips;
|
||||
mgr->capture_chips = pcxhr_board_params[pci_id->driver_data].capture_chips;
|
||||
|
|
Loading…
Reference in a new issue