[PATCH 3/7] media: rkvdec: hevc: bound the RPS reads by the control size

Nicolas Dufresne nicolas.dufresne at collabora.com
Mon Nov 16 05:49:44 PST 2026


Le samedi 14 novembre 2026 à 10:22 +0000, Daniel Golle a écrit :
> The RPS helpers read num_short_term_ref_pic_sets elements of the
> EXT_SPS_ST_RPS control and num_long_term_ref_pics_sps elements of the
> EXT_SPS_LT_RPS control, however many elements userspace passed.
> 

What did you want to say?

> Beyond
> the passed elements they read stale entries of the control's array,
> and past its allocation once the SPS counts more sets than the control

More broken text, can you work a bit on your messages, be concise, precise,
don't get into details but into the understanding of what you are achieving. The
code is precise enough.

> has ever held, as the control framework sizes a dynamic array for the
> largest element count it has seen. The short-term sets read from there
> are unchecked, and a num_negative_pics or num_positive_pics above 16
> overflows the calculated sets, the stack arrays of
> st_ref_pic_set_prediction() and the hardware RPS table.
> 
> A userspace V4L2 client that can open the RKVDEC m2m decoder can set an
> SPS whose counts exceed the number of elements it passed in these
> controls, so the reads run past the allocation.
> 
> Use the controls only when they hold at least as many elements as the
> SPS counts, and treat them as not set otherwise in both back ends.
> 
> Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 variant")
> Cc: stable at vger.kernel.org
> Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> ---
>  .../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;

So you are saying that if the passed array is too short, we should use an older
entry to none? That seems a little strange, what about up-front rejecting bad
entries?

Nicolas

>  	}
>  }
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> index e1936e87f45be..fea7ff48c0dce 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> @@ -604,8 +604,8 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx)
>  	 * On vdpu381, not setting the long and short term ref sets will just output wrong frames.
>  	 * Let's just warn about it and let the decoder run anyway.
>  	 */
> -	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_warn_ratelimited(rkvdec->dev, "Long and short term RPS not set\n");
>  	} else {
>  		rkvdec_hevc_assemble_hw_rps(&run, &tbl->rps, &hevc_ctx->st_cache);
> 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;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-rockchip/attachments/20261116/b3db005a/attachment.sig>


More information about the Linux-rockchip mailing list