Commit 0e11f7ef authored Dec 08, 2016 by Colin Ian King Committed by Greg Kroah-Hartman Nov 30, 2017

ASoC: rsnd: don't double free kctrl




[ Upstream commit 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 ]

On an error, snd_ctl_add already free's kctrl, so calling snd_ctl_free_one
to free it again leads to a double free error.  Fix this by removing
the extraneous snd_ctl_free_one call.

Issue found using static analysis with CoverityScan, CID 1372908

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0117c755

sound/soc/sh/rcar/core.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -978,10 +978,8 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
	return -ENOMEM;		return -ENOMEM;

	ret = snd_ctl_add(card, kctrl);		ret = snd_ctl_add(card, kctrl);
	if (ret < 0) {		if (ret < 0)
	snd_ctl_free_one(kctrl);
	return ret;		return ret;
	}

	cfg->update = update;		cfg->update = update;
	cfg->card = card;		cfg->card = card;