TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: cx23885: Fix snd_card_free call on null card pointer

Browse Source 
[ Upstream commit 7266dda2f1 ]

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: 9e44d63246 ("[media] cx23885: Add ALSA support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Colin Ian King
2021-08-04 10:50:10 +02:00
committed by Greg Kroah-Hartman
parent 388cebfa73
commit c34bfe4204
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/pci/cx23885/cx23885-alsa.c
+2 -1
View File
@@ -550,7 +550,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev)
SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, sizeof(struct cx23885_audio_dev), &card); THIS_MODULE, sizeof(struct cx23885_audio_dev), &card);
if (err < 0) if (err < 0)
goto error; goto error_msg;
chip = (struct cx23885_audio_dev *) card->private_data; chip = (struct cx23885_audio_dev *) card->private_data;
chip->dev = dev; chip->dev = dev;
@@ -576,6 +576,7 @@ struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev)
error: error:
snd_card_free(card); snd_card_free(card);
error_msg:
pr_err("%s(): Failed to register analog audio adapter\n", pr_err("%s(): Failed to register analog audio adapter\n",
__func__); __func__);