Skip to content

Commit

Permalink
ALSA: portman2x4: fix NULL pointer dereference
Browse files Browse the repository at this point in the history
While registering pardev, the irq_func was also registered. As a result
when we tried to probe for the card, an interrupt was generated and in
the ISR we tried to dereference private_data. But private_data is still
NULL as we have not yet done portman_create(). Lets probe for the device
after card is created.

Fixes: e6a1b7e ("ALSA: portman2x4 - use new parport device model")
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Sudip Mukherjee authored and Takashi Iwai committed Mar 2, 2016
1 parent d10a80d commit 03367bf
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions sound/drivers/portman2x4.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,18 +762,19 @@ static int snd_portman_probe(struct platform_device *pdev)
err = -EIO;
goto free_pardev;
}
err = portman_probe(p);
if (err) {
err = -EIO;
goto release_pardev;
}

if ((err = portman_create(card, pardev, &pm)) < 0) {
snd_printd("Cannot create main component\n");
goto release_pardev;
}
card->private_data = pm;
card->private_free = snd_portman_card_private_free;

err = portman_probe(p);
if (err) {
err = -EIO;
goto __err;
}

if ((err = snd_portman_rawmidi_create(card)) < 0) {
snd_printd("Creating Rawmidi component failed\n");
Expand Down

0 comments on commit 03367bf

Please sign in to comment.