Linux kernel staging patches
 help / color / mirror / Atom feed
From: Ricardo Ribalda <ribalda@chromium.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	 Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	 Sakari Ailus <sakari.ailus@linux.intel.com>,
	 Hans Verkuil <hverkuil@kernel.org>,
	Nas Chung <nas.chung@chipsnmedia.com>,
	 Jackson Lee <jackson.lee@chipsnmedia.com>,
	 Bingbu Cao <bingbu.cao@intel.com>,
	Tianshu Qiu <tian.shu.qiu@intel.com>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	 Keke Li <keke.li@amlogic.com>, Yong Zhi <yong.zhi@intel.com>,
	 Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	 linux-staging@lists.linux.dev,
	 Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
	 Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v2 4/6] media: chips-media: wave5: Add range checks for dec_output_info
Date: Fri, 01 May 2026 11:32:49 +0000	[thread overview]
Message-ID: <20260501-smatch-7-1-v2-4-a2fcfb2531ac@chromium.org> (raw)
In-Reply-To: <20260501-smatch-7-1-v2-0-a2fcfb2531ac@chromium.org>

If the driver's dec_output_info contains invalid data the driver can
write in invalid memory. Add a range check for that.

This fixes this smatch error:
drivers/media/platform/chips-media/wave5/wave5-vpuapi.c:588 wave5_vpu_dec_get_output_info() error: buffer overflow 'inst->frame_buf' 64 <= 127

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/platform/chips-media/wave5/wave5-vpuapi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c
index d26ffc942219..f77abd5e122a 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c
@@ -584,8 +584,15 @@ int wave5_vpu_dec_get_output_info(struct vpu_instance *inst, struct dec_output_i
 		p_dec_info->num_of_decoding_fbs : p_dec_info->num_of_display_fbs;
 
 	if (info->index_frame_display >= 0 &&
-	    info->index_frame_display < (int)max_dec_index)
-		info->disp_frame = inst->frame_buf[val + info->index_frame_display];
+	    info->index_frame_display < (int)max_dec_index) {
+		u32 idx = val + info->index_frame_display;
+
+		if (WARN_ON(idx >= MAX_REG_FRAME)) {
+			ret = -EINVAL;
+			goto err_out;
+		}
+		info->disp_frame = inst->frame_buf[idx];
+	}
 
 	info->rd_ptr = p_dec_info->stream_rd_ptr;
 	info->wr_ptr = p_dec_info->stream_wr_ptr;

-- 
2.54.0.545.g6539524ca2-goog


  parent reply	other threads:[~2026-05-01 11:33 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-01 11:32 [PATCH v2 0/6] media: Fix new smatch warnings Ricardo Ribalda
2026-05-01 11:32 ` [PATCH v2 1/6] media: v4l2-dev: Add range check for vdev->minor Ricardo Ribalda
2026-05-04  8:12   ` Sakari Ailus
2026-05-01 11:32 ` [PATCH v2 2/6] media: i2c: mt9p031: Rewrite a bitwise mask Ricardo Ribalda
2026-05-01 20:19   ` Laurent Pinchart
2026-05-02  7:56     ` Ricardo Ribalda
2026-05-02 16:54       ` Laurent Pinchart
2026-05-01 11:32 ` [PATCH v2 3/6] media: i2c: adv7604: Add range checks for chip info Ricardo Ribalda
2026-05-01 11:32 ` Ricardo Ribalda [this message]
2026-05-01 11:32 ` [PATCH v2 5/6] media: staging: ipu3-imgu: Add range check for imgu_css_cfg_acc_stripe Ricardo Ribalda
2026-05-04  8:22   ` Sakari Ailus
2026-05-04  8:25     ` Ricardo Ribalda
2026-05-01 11:32 ` [PATCH v2 6/6] media: amlogic-c3: Add validations for ae and awb config Ricardo Ribalda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260501-smatch-7-1-v2-4-a2fcfb2531ac@chromium.org \
    --to=ribalda@chromium.org \
    --cc=bingbu.cao@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hverkuil@kernel.org \
    --cc=jackson.lee@chipsnmedia.com \
    --cc=jacopo.mondi@ideasonboard.com \
    --cc=keke.li@amlogic.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=mchehab+samsung@kernel.org \
    --cc=mchehab@kernel.org \
    --cc=nas.chung@chipsnmedia.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=tian.shu.qiu@intel.com \
    --cc=yong.zhi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox