summaryrefslogtreecommitdiff
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 15:21:00 +0300
commit1af2853b4e97fd95262fdef311b2334337069bc9 (patch)
tree99b5038e5ce3e0547a3a5f728c8ed496f0f22c02
parentfe1c50fadc4eba1869a6ee3488208fe1c8305d7a (diff)
downloadlinux-1af2853b4e97fd95262fdef311b2334337069bc9.tar.xz
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>
-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 730bdf98565a..bb575873f2b2 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;