summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorAlper Ak <alperyasinak1@gmail.com>2025-12-27 11:40:37 +0300
committerSasha Levin <sashal@kernel.org>2026-03-04 07:21:40 -0500
commit5da29ade540b51763b950987bd410add7edaf3d1 (patch)
treef04bff2886d84d030d85dd5446328307a71d0da2 /drivers/media
parent4ff5b0fd1faa7cd4cbfeeb13b6d28111c4901161 (diff)
downloadlinux-5da29ade540b51763b950987bd410add7edaf3d1.tar.gz
linux-5da29ade540b51763b950987bd410add7edaf3d1.tar.bz2
linux-5da29ade540b51763b950987bd410add7edaf3d1.zip
media: rockchip: rga: Fix possible ERR_PTR dereference in rga_buf_init()
[ Upstream commit 81f8e0e6a2e115df9274d0289779f8fca694479c ] rga_get_frame() can return ERR_PTR(-EINVAL) when buffer type is unsupported or invalid. rga_buf_init() does not check the return value and unconditionally dereferences the pointer when accessing f->size. Add proper ERR_PTR checking and return the error to prevent dereferencing an invalid pointer. Fixes: 6040702ade23 ("media: rockchip: rga: allocate DMA descriptors per buffer") Cc: stable@vger.kernel.org Signed-off-by: Alper Ak <alperyasinak1@gmail.com> Reviewed-by: Michael Tretter <m.tretter@pengutronix.de> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/rockchip/rga/rga-buf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/platform/rockchip/rga/rga-buf.c
index 70808049d2e8..ddc244ffc68c 100644
--- a/drivers/media/platform/rockchip/rga/rga-buf.c
+++ b/drivers/media/platform/rockchip/rga/rga-buf.c
@@ -80,6 +80,9 @@ static int rga_buf_init(struct vb2_buffer *vb)
struct rga_frame *f = rga_get_frame(ctx, vb->vb2_queue->type);
size_t n_desc = 0;
+ if (IS_ERR(f))
+ return PTR_ERR(f);
+
n_desc = DIV_ROUND_UP(f->size, PAGE_SIZE);
rbuf->n_desc = n_desc;