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

Commit b1fbebd4 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path 



After allocating model-dependent data for M-Audio FW1814 and ProjectMix
I/O, ALSA bebob driver has memory leak at error path.

This commit releases the allocated data at the error path.

Fixes: 04a2c73c('ALSA: bebob: delayed registration of sound card')
Cc: <stable@vger.kernel.org> # v4.7+
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 37a3a98e

sound/firewire/bebob/bebob.c

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ do_registration(struct work_struct *work) 
error:

	mutex_unlock(&devices_mutex);

	snd_bebob_stream_destroy_duplex(bebob);

	kfree(bebob->maudio_special_quirk);

	bebob->maudio_special_quirk = NULL;

	snd_card_free(bebob->card);

	dev_info(&bebob->unit->device,

		 "Sound card registration failed: %d\n", err);

sound/firewire/bebob/bebob_maudio.c

+0 −4
Original line number Diff line number Diff line
@@ -294,10 +294,6 @@ snd_bebob_maudio_special_discover(struct snd_bebob *bebob, bool is1814) 
		bebob->midi_output_ports = 2;

	}

end:

	if (err < 0) {

		kfree(params);

		bebob->maudio_special_quirk = NULL;

	}

	mutex_unlock(&bebob->mutex);

	return err;

}