lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 019/542] media: meson: add missing allocation failure check on new_buf
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 11e0e167d071a28288a7a0a211d48c571d19b56f ]

    Currently if the allocation of new_buf fails then a null pointer
    dereference occurs when assiging new_buf->vb. Avoid this by returning
    early on a memory allocation failure as there is not much more can
    be done at this point.

    Addresses-Coverity: ("Dereference null return")

    Fixes: 3e7f51bd9607 ("media: meson: add v4l2 m2m video decoder driver")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Reviewed-by: Kevin Hilman <khilman@baylibre.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/staging/media/meson/vdec/vdec.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
    index 0a1a04fd5d13d..8dd1396909d7e 100644
    --- a/drivers/staging/media/meson/vdec/vdec.c
    +++ b/drivers/staging/media/meson/vdec/vdec.c
    @@ -133,6 +133,8 @@ vdec_queue_recycle(struct amvdec_session *sess, struct vb2_buffer *vb)
    struct amvdec_buffer *new_buf;

    new_buf = kmalloc(sizeof(*new_buf), GFP_KERNEL);
    + if (!new_buf)
    + return;
    new_buf->vb = vb;

    mutex_lock(&sess->bufs_recycle_lock);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:24    [W:3.677 / U:0.912 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site