lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 393/917] media: cx23885: Fix snd_card_free call on null card pointer
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ 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: 9e44d63246a9 ("[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>
    ---
    drivers/media/pci/cx23885/cx23885-alsa.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
    index ab14d35214aa8..25dc8d4dc5b73 100644
    --- a/drivers/media/pci/cx23885/cx23885-alsa.c
    +++ b/drivers/media/pci/cx23885/cx23885-alsa.c
    @@ -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__);

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:10    [W:4.030 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site