Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bbf7e02 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Takashi Iwai
Browse files

ALSA: mts64: fix NULL pointer dereference 



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 snd_mts64_create(). Lets probe
for the card after mts64 is created.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Fixes: 94a57350 ("ALSA: mts64: use new parport device model")
Signed-off-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1387e3ea

sound/drivers/mts64.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -964,11 +964,6 @@ static int snd_mts64_probe(struct platform_device *pdev) 
		err = -EIO;

		err = -EIO;

		goto free_pardev;

		goto free_pardev;

	}

	}

	err = mts64_probe(p);

	if (err) {

		err = -EIO;

		goto release_pardev;

	}





	if ((err = snd_mts64_create(card, pardev, &mts)) < 0) {

	if ((err = snd_mts64_create(card, pardev, &mts)) < 0) {

		snd_printd("Cannot create main component\n");

		snd_printd("Cannot create main component\n");
@@ -977,6 +972,12 @@ static int snd_mts64_probe(struct platform_device *pdev) 
	card->private_data = mts;

	card->private_data = mts;

	card->private_free = snd_mts64_card_private_free;

	card->private_free = snd_mts64_card_private_free;





	err = mts64_probe(p);

	if (err) {

		err = -EIO;

		goto __err;

	}

	

	if ((err = snd_mts64_rawmidi_create(card)) < 0) {

	if ((err = snd_mts64_rawmidi_create(card)) < 0) {

		snd_printd("Creating Rawmidi component failed\n");

		snd_printd("Creating Rawmidi component failed\n");

		goto __err;

		goto __err;