lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 348/913] media: vidtv: Check for null return of vzalloc
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit e6a21a14106d9718aa4f8e115b1e474888eeba44 ]

    As the possible failure of the vzalloc(), e->encoder_buf might be NULL.
    Therefore, it should be better to check it in order
    to guarantee the success of the initialization.
    If fails, we need to free not only 'e' but also 'e->name'.
    Also, if the allocation for ctx fails, we need to free 'e->encoder_buf'
    else.

    Fixes: f90cf6079bf6 ("media: vidtv: add a bridge driver")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/test-drivers/vidtv/vidtv_s302m.c | 17 +++++++++++++----
    1 file changed, 13 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
    index d79b65854627..4676083cee3b 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
    +++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
    @@ -455,6 +455,9 @@ struct vidtv_encoder
    e->name = kstrdup(args.name, GFP_KERNEL);

    e->encoder_buf = vzalloc(VIDTV_S302M_BUF_SZ);
    + if (!e->encoder_buf)
    + goto out_kfree_e;
    +
    e->encoder_buf_sz = VIDTV_S302M_BUF_SZ;
    e->encoder_buf_offset = 0;

    @@ -467,10 +470,8 @@ struct vidtv_encoder
    e->is_video_encoder = false;

    ctx = kzalloc(priv_sz, GFP_KERNEL);
    - if (!ctx) {
    - kfree(e);
    - return NULL;
    - }
    + if (!ctx)
    + goto out_kfree_buf;

    e->ctx = ctx;
    ctx->last_duration = 0;
    @@ -498,6 +499,14 @@ struct vidtv_encoder
    e->next = NULL;

    return e;
    +
    +out_kfree_buf:
    + kfree(e->encoder_buf);
    +
    +out_kfree_e:
    + kfree(e->name);
    + kfree(e);
    + return NULL;
    }

    void vidtv_s302m_encoder_destroy(struct vidtv_encoder *e)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-06 00:51    [W:2.082 / U:5.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site