]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: meson: add missing allocation failure check on new_buf
authorColin Ian King <colin.king@canonical.com>
Wed, 4 Dec 2019 14:11:59 +0000 (15:11 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 13 Dec 2019 08:28:43 +0000 (09:28 +0100)
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>
drivers/staging/media/meson/vdec/vdec.c

index 0a1a04fd5d13d16c6afe6ddbb25946e42bb2f38a..8dd1396909d7e61ad3c53c15142084ed2cafae3f 100644 (file)
@@ -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);