summaryrefslogtreecommitdiff
path: root/drivers/staging/media/meson
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2019-12-04 15:11:59 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2019-12-13 09:28:43 +0100
commit11e0e167d071a28288a7a0a211d48c571d19b56f (patch)
treeb5074bdf9ea54730e1916b88b779d3f0003bd950 /drivers/staging/media/meson
parent55f240a21eb13717da2872ebef2eb0af4007a5bd (diff)
media: meson: add missing allocation failure check on new_buf
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>
Diffstat (limited to 'drivers/staging/media/meson')
-rw-r--r--drivers/staging/media/meson/vdec/vdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index 0a1a04fd5d13..8dd1396909d7 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);