[PATCH v2 4/7] media: rkvdec: hevc: refuse RPS controls shorter than the SPS counts
From: Daniel Golle
Date: Fri Nov 20 2026 - 18:42:55 EST
The SPS control tells how many short-term and long-term reference
picture sets a stream has. The sets themselves are passed in two
separate array controls, EXT_SPS_ST_RPS and EXT_SPS_LT_RPS. The driver
reads as many array elements as the SPS announces, without checking
that userspace passed that many. A larger count in the SPS makes it
read past the end of the array.
Compare the array size with the SPS count when a decode job is
prepared, and refuse the job if the array is too short. The controls
can be set independently, so this is the first point where both values
are known.
Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 variant")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Daniel Golle <daniel@xxxxxxxxxxxxxx>
---
Changes since v1:
- Move after the VDPU381 refusal, was 3/7, so that a control which is
too short fails the job in both back ends (Nicolas Dufresne)
- Change the subject, was "media: rkvdec: hevc: bound the RPS reads by
the control size"
- Rewrite the commit message, and say why the size cannot be checked
when the control is set (Nicolas Dufresne)
- The VDPU381 hunk now applies to the refusal instead of the warning,
no other code change
.../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 12 ++++++------
.../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 4 ++--
.../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c
index c249e3f16f42c..797a16517ed59 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c
@@ -448,18 +448,18 @@ void rkvdec_hevc_run_preamble(struct rkvdec_ctx *ctx,
V4L2_CID_STATELESS_HEVC_SCALING_MATRIX);
run->scaling_matrix = ctrl ? ctrl->p_cur.p : NULL;
+ run->ext_sps_st_rps = NULL;
if (ctx->has_sps_st_rps) {
ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS);
- run->ext_sps_st_rps = ctrl ? ctrl->p_cur.p : NULL;
- } else {
- run->ext_sps_st_rps = NULL;
+ if (ctrl && ctrl->elems >= run->sps->num_short_term_ref_pic_sets)
+ run->ext_sps_st_rps = ctrl->p_cur.p;
}
+ run->ext_sps_lt_rps = NULL;
if (ctx->has_sps_lt_rps) {
ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
V4L2_CID_STATELESS_HEVC_EXT_SPS_LT_RPS);
- run->ext_sps_lt_rps = ctrl ? ctrl->p_cur.p : NULL;
- } else {
- run->ext_sps_lt_rps = NULL;
+ if (ctrl && ctrl->elems >= run->sps->num_long_term_ref_pics_sps)
+ run->ext_sps_lt_rps = ctrl->p_cur.p;
}
}
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
index 7627282c15f0a..db836536e601b 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
@@ -596,8 +596,8 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx)
rkvdec_hevc_run_preamble(ctx, &run);
- if ((!ctx->has_sps_lt_rps && run.sps->num_long_term_ref_pics_sps) ||
- (!ctx->has_sps_st_rps && run.sps->num_short_term_ref_pic_sets)) {
+ if ((!run.ext_sps_lt_rps && run.sps->num_long_term_ref_pics_sps) ||
+ (!run.ext_sps_st_rps && run.sps->num_short_term_ref_pic_sets)) {
dev_err_ratelimited(rkvdec->dev, "Long and short term RPS not set\n");
rkvdec_run_postamble(ctx, &run.base);
return -EINVAL;
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
index e9d8b590f0d58..c409d21c08598 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
@@ -550,8 +550,8 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx)
* To be on the safe side for this new v4l2 control, write an error in the log and mark
* the buffer as failed by returning an error here.
*/
- if ((!ctx->has_sps_lt_rps && run.sps->num_long_term_ref_pics_sps) ||
- (!ctx->has_sps_st_rps && run.sps->num_short_term_ref_pic_sets)) {
+ if ((!run.ext_sps_lt_rps && run.sps->num_long_term_ref_pics_sps) ||
+ (!run.ext_sps_st_rps && run.sps->num_short_term_ref_pic_sets)) {
dev_err_ratelimited(rkvdec->dev, "Long and short term RPS not set\n");
rkvdec_run_postamble(ctx, &run.base);
return -EINVAL;
--
2.56.1