ALSA: oxfw: fix memory leak for model-dependent data at error path

takaswie · gregkh · commit 996899a9cbd8 · 2018-09-29T03:06:03.000-07:00
commit ce925f0 upstream. After allocating model-dependent data, ALSA OXFW driver has memory leak of the data at error path. This commit releases the data at the error path. Fixes: 6c29230 ('ALSA: oxfw: delayed registration of sound card') Cc: <stable@vger.kernel.org> # v4.7+ Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
@@ -276,6 +276,8 @@ static void do_registration(struct work_struct *work)
 	if (oxfw->has_output)
 		snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->tx_stream);
 	snd_card_free(oxfw->card);
+	kfree(oxfw->spec);
+	oxfw->spec = NULL;
 	dev_info(&oxfw->unit->device,
 		 "Sound card registration failed: %d\n", err);
 }

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,8 @@ static void do_registration(struct work_struct *work)`
`276`	`276`	`if (oxfw->has_output)`
`277`	`277`	`snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->tx_stream);`
`278`	`278`	`snd_card_free(oxfw->card);`
	`279`	`+ kfree(oxfw->spec);`
	`280`	`+ oxfw->spec = NULL;`
`279`	`281`	`dev_info(&oxfw->unit->device,`
`280`	`282`	`"Sound card registration failed: %d\n", err);`
`281`	`283`	`}`