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

Commit 71411bd7 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

media: cx23885: Fix snd_card_free call on null card pointer 



[ Upstream commit 7266dda2f1dfe151b12ef0c14eb4d4e622fb211c ]

Currently a call to snd_card_new that fails will set card with a NULL
pointer, this causes a null pointer dereference on the error cleanup
path when card it passed to snd_card_free. Fix this by adding a new
error exit path that does not call snd_card_free and exiting via this
new path.

Addresses-Coverity: ("Explicit null dereference")

Fixes: 9e44d632 ("[media] cx23885: Add ALSA support")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1c2c8030

drivers/media/pci/cx23885/cx23885-alsa.c

+2 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) 
			   SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			THIS_MODULE, sizeof(struct cx23885_audio_dev), &card);

	if (err < 0)

		goto error;

		goto error_msg;



	chip = (struct cx23885_audio_dev *) card->private_data;

	chip->dev = dev;
@@ -576,6 +576,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) 


error:

	snd_card_free(card);

error_msg:

	pr_err("%s(): Failed to register analog audio adapter\n",

	       __func__);