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

Commit 5f13d670 authored by Su Hui's avatar Su Hui Committed by Greg Kroah-Hartman
Browse files

ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer 



[ Upstream commit 79597c8bf64ca99eab385115743131d260339da5 ]

smatch error:
sound/pci/ac97/ac97_codec.c:2354 snd_ac97_mixer() error:
we previously assumed 'rac97' could be null (see line 2072)

remove redundant assignment, return error if rac97 is NULL.

Fixes: da3cec35 ("ALSA: Kill snd_assert() in sound/pci/*")
Signed-off-by: default avatarSu Hui <suhui@nfschina.com>
Link: https://lore.kernel.org/r/20230615021732.1972194-1-suhui@nfschina.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 801c8341

sound/pci/ac97/ac97_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -2006,8 +2006,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, 
		.dev_disconnect =	snd_ac97_dev_disconnect,

	};



	if (rac97)

		*rac97 = NULL;

	if (!rac97)

		return -EINVAL;

	if (snd_BUG_ON(!bus || !template))

		return -EINVAL;

	if (snd_BUG_ON(template->num >= 4))