Thread (11 messages) 11 messages, 5 authors, 2026-02-19

Re: [PATCH 1/2] media: rockchip: rkcif: fix off by one bugs

From: Paul Elder <paul.elder@ideasonboard.com>
Date: 2026-02-18 02:54:45
Also in: linux-media, linux-rockchip, lkml

Quoting Michael Riesch (2026-02-16 22:49:56)
From: Dan Carpenter <redacted>

Change these comparisons from > vs >= to avoid accessing one element
beyond the end of the arrays.

Fixes: 1f2353f5a1af ("media: rockchip: rkcif: add support for rk3568 vicap mipi capture")
Cc: stable@kernel.org
Signed-off-by: Dan Carpenter <redacted>
Reviewed-by: Michael Riesch <michael.riesch@collabora.com>
Signed-off-by: Michael Riesch <michael.riesch@collabora.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
quoted hunk ↗ jump to hunk
---
 drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
index 1b81bcc067ef..a933df682acc 100644
--- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
+++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c
@@ -489,8 +489,8 @@ static inline unsigned int rkcif_mipi_get_reg(struct rkcif_interface *interface,
 
        block = interface->index - RKCIF_MIPI_BASE;
 
-       if (WARN_ON_ONCE(block > RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) ||
-           WARN_ON_ONCE(index > RKCIF_MIPI_REGISTER_MAX))
+       if (WARN_ON_ONCE(block >= RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) ||
+           WARN_ON_ONCE(index >= RKCIF_MIPI_REGISTER_MAX))
                return RKCIF_REGISTER_NOTSUPPORTED;
 
        offset = rkcif->match_data->mipi->blocks[block].offset;
@@ -510,9 +510,9 @@ static inline unsigned int rkcif_mipi_id_get_reg(struct rkcif_stream *stream,
        block = stream->interface->index - RKCIF_MIPI_BASE;
        id = stream->id;
 
-       if (WARN_ON_ONCE(block > RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) ||
-           WARN_ON_ONCE(id > RKCIF_ID_MAX) ||
-           WARN_ON_ONCE(index > RKCIF_MIPI_ID_REGISTER_MAX))
+       if (WARN_ON_ONCE(block >= RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) ||
+           WARN_ON_ONCE(id >= RKCIF_ID_MAX) ||
+           WARN_ON_ONCE(index >= RKCIF_MIPI_ID_REGISTER_MAX))
                return RKCIF_REGISTER_NOTSUPPORTED;
 
        offset = rkcif->match_data->mipi->blocks[block].offset;
-- 
2.39.5
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help