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

Commit 2fbf182e authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds
Browse files

[PATCH] alsa: fix error paths in snd_ctl_elem_add() 



Fix bugs in error paths of snd_ctl_elem_add()
 - NULL reference
 - double free (already freed in snd_ctl_add())

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5aee405c

sound/core/control.c

+2 −4
Original line number Diff line number Diff line
@@ -959,17 +959,15 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 
	kctl.private_free = snd_ctl_elem_user_free;

	_kctl = snd_ctl_new(&kctl, access);

	if (_kctl == NULL) {

		kfree(_kctl->private_data);

		kfree(ue);

		return -ENOMEM;

	}

	_kctl->private_data = ue;

	for (idx = 0; idx < _kctl->count; idx++)

		_kctl->vd[idx].owner = file;

	err = snd_ctl_add(card, _kctl);

	if (err < 0) {

		snd_ctl_free_one(_kctl);

	if (err < 0)

		return err;

	}



	down_write(&card->controls_rwsem);

	card->user_ctl_count++;