From nobody Mon Jun 8 17:46:39 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B4FB3644BE for ; Wed, 27 May 2026 19:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911299; cv=none; b=kJc3lyAbmUj1eBBZ+pWjDtyKKNz4GxRlpBUXbjmOZcpL9y04Pj3jnNk90FM1ydkM1FEW3YH0azRk4HgwB5dl3e9h9YcCf1jrXKZ/K05b0vOoW0WxYTGDGaL0ucOc15Opqffo8op8JJD8SnklPK/EEOkCVrVcrcadWGJLHvWM2TQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911299; c=relaxed/simple; bh=ls9Q2NTNnUqYE9WFLwlbflCuLfOEy5TVf3Kpig70cRU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RKweReDe90YysOBCpM5/Xm1ABXQVKTb1trKLSxlSJs3Y9jk0GjFYP7jcjDeQX9kbmPnzDcDiBwr9LuS1L9r40TLT3wFIjXEmB4sQh3gQfIa3QoAQF33U6CliyU8+QU+xW9ZKeFz31lJIajQ4RF0zyT26fE1P7ce0Zyy3M+8YiHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XO5zxaDv; arc=none smtp.client-ip=209.85.222.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XO5zxaDv" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-914c12b9458so286370485a.2 for ; Wed, 27 May 2026 12:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779911297; x=1780516097; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c11hqP4/VNZytv7vm7NkzIMTSch4hrmtgsXa84FfdMs=; b=XO5zxaDvZ0LMHTjBLddhkLHWvWBYhqL638utXQjFZwtRywTnBEsGZq2zr0jwLYdR8u TjlflIt/dKRMIOlPSSWDYt9vi2JjpSDi2gecYh2bO6IAV/fmV5YwIu6Z9/xIHKtDBKp6 Eolsou11QjEm57zW5r36jRAcrZbUKF8FYikqcHbK9Av5P8vQkvL+JVrN5gOajLSY7cjP 7Sus64U1cN2pFu5ZdRc6vwlmCH1nWJFGwwXCsoVe0azOIBAcZhufbs1c3vSjxjfSAIg9 j6O+Vf0+UPqGvgIVH7exyExixOwJNwnJMSXu3N4uDCdF25cETaa7NTOaq9Xo3ccDSlk/ uIkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779911297; x=1780516097; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c11hqP4/VNZytv7vm7NkzIMTSch4hrmtgsXa84FfdMs=; b=r58vmtScytKleev5HYpn2P5vEyuGcyQShH9AfVwKZ1J+zqZBfcqRzMgns4MZg0x02+ jCSW5WXet3+tP0mKunUGOVCg+GYo+eW9ZNjQfP+1viiYJDjCxHUOW70SqGe2mzRLy2QR 8R+o9YefLbY3481a1NhvYJA2h9lCTTtwwuXAvw/kMS1KFs5p/OweNmcLwb6mQpJS37Z0 EeA/xTHcfyA87cvi7Usz2uKqY7ObcgoBmpqWrcbgAP6C0lma357ypS0xSEXFLssR3DVJ UQcTbJXwPMxU7hkR9QJn7ZZo+7MsMPHWkaffYRc2ERdI5q22Ul6bErF953ie8hdraqSY U42A== X-Forwarded-Encrypted: i=1; AFNElJ+HG0MRcA9K13HgNDpNQFcB5PhbT+EDk4JtFVkjnUFutxFJ8YzCYg47x57Qo2aCvgtdphB+ujYkGMfoGPg=@vger.kernel.org X-Gm-Message-State: AOJu0YxBC5rGfEs9WeDUBZdmZi0iQpNeNwBA2mQey/UouPzR3du583r+ 9SXp6mZ7LLvFAOLxm6VBnBD5yNhitasyjpyBjeHKGZSCYcKThPGlsWOC X-Gm-Gg: Acq92OHRAvH3sUql/irddluaGeZ12He+2MLB+SqIz/jJ6lTGgOVhfdITMf0ojRcr9l6 JA+hBdZNY5wIm826R4DHRAZvUNv7nQz5xxb5wb5UacgBKrj7IHi7Qil9260c86Oawtc/APX/RIV uCODcqWLSfL7QIa1iBnzVYrKmXHSBoWJgSUvLxhff+RrY3YZOUl+WHClU6fMfn5ULh13te0AL5W eCv7JUOa/PCD3+oHwCLfUuEUZzadqsg6RjdtpZx7CowEewuckFuhXMkNY9PchYJamTUpzW+Kvvd OHYNxE9uCGwU5bsRYiJPCT71MoEZdPqi6sNGHc8olp8NkuN2EEM2ViHhGM2zX3DtCxwMKmCycZx 6loYvIpQDVTuZNI8wQlnaIWJfI7N11p1W+KTTXWmh4ieiCalSh/iWGTwpebh0sXcs0ucBeNpK2C V2yXqSB8JHrAZArNtVrJbUcIplkiiCHZUgpfb3z776h07gqpydktgl/Y8I908cs6CvzpmiK0mtS bC2yCVL0i6NfwUNrm0ZOrrHhgm2wB6Hoq76u5r2o1u4mIAVncuclA== X-Received: by 2002:a05:620a:2a08:b0:90f:624d:70d3 with SMTP id af79cd13be357-914b4928045mr3475904085a.23.1779911297364; Wed, 27 May 2026 12:48:17 -0700 (PDT) Received: from server0.tail6e7dd.ts.net (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-914f87017a0sm564942385a.15.2026.05.27.12.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 12:48:16 -0700 (PDT) From: Michael Bommarito To: Detlev Casanova , Ezequiel Garcia , Mauro Carvalho Chehab Cc: Hans Verkuil , Nicolas Dufresne , Heiko Stuebner , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/3] media: rkvdec: hevc: tighten EXT SPS RPS control dimensions Date: Wed, 27 May 2026 15:47:35 -0400 Message-ID: <20260527194737.1999409-2-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260527194737.1999409-1-michael.bommarito@gmail.com> References: <20260513181922.2075438-1-michael.bommarito@gmail.com> <20260527194737.1999409-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The VDPU381 HEVC driver registers V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS and V4L2_CID_STATELESS_HEVC_EXT_SPS_LT_RPS with .cfg.dims =3D { 65 }, but the HEVC spec caps num_short_term_ref_pic_sets at 64 (ITU-T H.265 7.4.8) and num_long_term_ref_pics_sps at 32 (7.4.3.2.1). The hardware descriptor table (struct rkvdec_rps) sizes match those spec limits: refs[32] and short_term_ref_sets[64]. Reduce the dims to { 64 } and { 32 } respectively so the V4L2 control framework rejects oversized payloads before any driver code runs. Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 varia= nt") Cc: stable@vger.kernel.org Suggested-by: Detlev Casanova Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito --- drivers/media/platform/rockchip/rkvdec/rkvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/medi= a/platform/rockchip/rkvdec/rkvdec.c index 1d1e9bfef8e96..4fd06f4c04db0 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c @@ -278,12 +278,12 @@ static const struct rkvdec_ctrl_desc vdpu38x_hevc_ctr= l_descs[] =3D { { .cfg.id =3D V4L2_CID_STATELESS_HEVC_EXT_SPS_ST_RPS, .cfg.ops =3D &rkvdec_ctrl_ops, - .cfg.dims =3D { 65 }, + .cfg.dims =3D { 64 }, }, { .cfg.id =3D V4L2_CID_STATELESS_HEVC_EXT_SPS_LT_RPS, .cfg.ops =3D &rkvdec_ctrl_ops, - .cfg.dims =3D { 65 }, + .cfg.dims =3D { 32 }, }, }; =20 --=20 2.53.0 From nobody Mon Jun 8 17:46:39 2026 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CABCE3B19D1 for ; Wed, 27 May 2026 19:48:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911302; cv=none; b=iaCdxbG5Puxquc4Lw6B+Ig0Fd7r6mxcOTkyM+sy4KUdz5zDR649MmforI4rbXW86ECVMBg48YEQII52e4QsHYIWhsA/G8Bq1SufSgvmsFGTvdjBpfcNQ9XrCSggp/JbCHmEpiplIsXx4GIoJG37YW0s+3LCfTZnxTEaGAq90cQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911302; c=relaxed/simple; bh=I53hd6CWTc3R94gXD+1qGG83yFt3BgYNnue52JOpibA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K9IpkcxqFbgtEa9aTz70zLnMmQS2mmkO4o0nalY1ztv/cPU9rQpK3W0zHmRJqB0qPfA6g64irRUvKN6SQuuUs0aS4/2SbF6f3OfTwmhGPtguVqosrS29N2ii/4JPfjZ2TrU1uHVC+kE7N9tO/V/uG79mjrE4HydZnnPDSWpgE3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eVFU/fEQ; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eVFU/fEQ" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-91080895355so1360158885a.3 for ; Wed, 27 May 2026 12:48:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779911299; x=1780516099; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PvwC2v7tf0bP6Dcjl3lKTCXZwlNlpqu4CB+86cy9Tlo=; b=eVFU/fEQPAp0ZdXRZjGxp829SgOYsKhhyBzp3VQBI8jySwgmIR1tA9zRrGRYKKdfOn YGCxwfyj+fwsw4R1JUNuFz4uYo05WlITufcQfx77Wo6EiGtwqup36/r41J46/rDAcriO OyjRpaWSHnQ7HradsvDffiMbWHhGbrWfuNXXP39Rtg+TwL5Fv8Wt70W3qrEa+61OeUnB N1NHYeNg+6GmfvGn3icrc3lHaDWdSeAwxmWXRr9B78NDdqLKcaBXn7/Gu7YS8a/pN2A9 nLiZ4UgjOuS9wPqEx+jHfWLHu/Ow1HSdKLrUraWp3nNu/cu4+jPmnq3s8mnXSk/mBloQ EAPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779911299; x=1780516099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PvwC2v7tf0bP6Dcjl3lKTCXZwlNlpqu4CB+86cy9Tlo=; b=k84q0Zs9Lt7Z7nqFP+RY4WG6hzf1uxDTGlQbLI8HN6xJwxDS6pC+xa2gwTyvtn7NMg 95JusEuorg6UfO5bJcVOFI3wgKQrA+k7JR7YG7AUE7KsfL6vMER8A4NsvOsbkvpFlUvy IDqj4KGR1m6zoiM9IC1lUnkWh1QEBLitFKjbYzW69uoFdkknTApRSZZw3wJPDO1eZHOa kgESKfl46eMI+1wQewNoO6+OYD/QUmkdAOGQq8/CCvlTK7arB+zF6CjetCp3MkcOgxsE kI7Bu5G6r+h8sq1H+u/R6x1lphZz7xuCkhsOyvDe8cer00OU/gF08vrJSGUj1txG8scF 4aiw== X-Forwarded-Encrypted: i=1; AFNElJ+aDV4aEYY8N4slpDiTLjFEFGYakIjL9CepIMl5IQ2yplG43FmyrHDe9j/vK+R3EDYBxLfElHYcM/bb0Yg=@vger.kernel.org X-Gm-Message-State: AOJu0YxzILmw4lUsFMj8IxNXhwm2Y5WUiAdGhdZrlTGL539vQkQOoqpd H4w363IE/XLfSFV6ArY/EkqIDJHLdb1SPMZ6GPJiAOIIsixwmNFurTjI X-Gm-Gg: Acq92OEIH19ltDVXEXJ09uOFmr2bAFB0viBEplPDlCCaeyH/GSseoTcdVdN7r7BEqrQ ytBkWxFfV73Fpi2BaB+keL718LHJMI5gXm/oUnET9fPtZJIl9VAwSlMITolP50tRVyOC6rtmgrc cdASfLVZlyouBd0LJL9gpxQI9/gzD2bUgWvdwEERc4TzJRLDZ9/VUGD4LnfqJJRx4C4KFnePLl+ gNSZnoqW2CAv5dptgbEnU1dQq3op2NP6hIGSm+j5HSKktRIE8yBg7bLtlLIeBstx0QCY5UEbT4M /OFk5qZkwMzNF3nrh4JPH9ZgMJFaoI3smgj6ZGw6vUJKAwyZA1XVh5SDpCw3BAn9UCziJNgQ1+D g14aRJV6LBdZZGlJiXQHGCD9FuhgrV5JK8rAFDkLj4orWNmo7eecfqfwxEnmB6NtqbkMLlCh7yz tWAlbWHNywCWh6Nhz9qM4Dk1ccI21GqIvOIKu9l/Yuyha4SxqL1ZrQZbhkb4MI/W4Wa95kgPGC7 HhQ53NiGKS0A6X136wjnQVrcLKI4UuMQekYgQcra7bgJZX7/ajpDg== X-Received: by 2002:a05:620a:2b45:b0:914:da39:eadb with SMTP id af79cd13be357-914da39ee49mr2225042385a.12.1779911298765; Wed, 27 May 2026 12:48:18 -0700 (PDT) Received: from server0.tail6e7dd.ts.net (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-914f87017a0sm564942385a.15.2026.05.27.12.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 12:48:18 -0700 (PDT) From: Michael Bommarito To: Detlev Casanova , Ezequiel Garcia , Mauro Carvalho Chehab Cc: Hans Verkuil , Nicolas Dufresne , Heiko Stuebner , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 2/3] media: v4l2-ctrls: validate HEVC EXT SPS RPS counts Date: Wed, 27 May 2026 15:47:36 -0400 Message-ID: <20260527194737.1999409-3-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260527194737.1999409-1-michael.bommarito@gmail.com> References: <20260513181922.2075438-1-michael.bommarito@gmail.com> <20260527194737.1999409-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The HEVC SPS control carries the short-term and long-term RPS counts that decoder drivers use to walk the matching EXT SPS dynamic arrays. Reject SPS values that exceed the HEVC limits of 64 short-term sets and 32 long-term references so drivers cannot later index beyond those controls. Also reject EXT SPS ST RPS entries whose negative or positive picture counts exceed the 16-entry arrays, or whose combined delta-POC count exceeds the HEVC DPB maximum. Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 varia= nt") Cc: stable@vger.kernel.org Suggested-by: Detlev Casanova Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito --- drivers/media/v4l2-core/v4l2-ctrls-core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2= -core/v4l2-ctrls-core.c index 6b375720e395c..a1d773e5de20c 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -16,6 +16,9 @@ =20 static const union v4l2_ctrl_ptr ptr_null; =20 +#define V4L2_HEVC_MAX_SHORT_TERM_REF_PIC_SETS 64 +#define V4L2_HEVC_MAX_LONG_TERM_REF_PICS_SPS 32 + static void fill_event(struct v4l2_event *ev, struct v4l2_ctrl *ctrl, u32 changes) { @@ -1213,6 +1216,10 @@ static int std_validate_compound(const struct v4l2_c= trl *ctrl, u32 idx, case V4L2_CTRL_TYPE_HEVC_SPS: p_hevc_sps =3D p; =20 + if (p_hevc_sps->num_short_term_ref_pic_sets > + V4L2_HEVC_MAX_SHORT_TERM_REF_PIC_SETS) + return -EINVAL; + if (!(p_hevc_sps->flags & V4L2_HEVC_SPS_FLAG_PCM_ENABLED)) { p_hevc_sps->pcm_sample_bit_depth_luma_minus1 =3D 0; p_hevc_sps->pcm_sample_bit_depth_chroma_minus1 =3D 0; @@ -1223,6 +1230,9 @@ static int std_validate_compound(const struct v4l2_ct= rl *ctrl, u32 idx, if (!(p_hevc_sps->flags & V4L2_HEVC_SPS_FLAG_LONG_TERM_REF_PICS_PRESENT)) p_hevc_sps->num_long_term_ref_pics_sps =3D 0; + else if (p_hevc_sps->num_long_term_ref_pics_sps > + V4L2_HEVC_MAX_LONG_TERM_REF_PICS_SPS) + return -EINVAL; break; =20 case V4L2_CTRL_TYPE_HEVC_PPS: @@ -1267,6 +1277,11 @@ static int std_validate_compound(const struct v4l2_c= trl *ctrl, u32 idx, =20 if (p_hevc_st_rps->flags & ~V4L2_HEVC_EXT_SPS_ST_RPS_FLAG_INTER_REF_PIC_= SET_PRED) return -EINVAL; + if (p_hevc_st_rps->num_negative_pics > 16 || + p_hevc_st_rps->num_positive_pics > 16 || + p_hevc_st_rps->num_negative_pics + + p_hevc_st_rps->num_positive_pics > 16) + return -EINVAL; break; =20 case V4L2_CTRL_TYPE_HEVC_EXT_SPS_LT_RPS: --=20 2.53.0 From nobody Mon Jun 8 17:46:39 2026 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E5563B19C6 for ; Wed, 27 May 2026 19:48:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911312; cv=none; b=bbLudz/mTy1HlwdtnoJBZhmohFYl8gWFbrji7o5TcF+DIPksxcwyjg7pGoD7TY6wqEHm9BYoQiPUAK+tI3i4LnqHD2D0EDRtxJmFgNN11QWG4qnPmj2Hec8ZqP8NqGUz2ntrS8o7AGTDUGyTFkxiHeBImdScnCrmsSEWtY4WCoI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779911312; c=relaxed/simple; bh=uNozSP0l8kkWDkzSOJfeL5dVpUS6xiLbgNu4M8nx/E0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=REGppUYay0b6EgQIqJAvrNgIUHXRzBPU+Qnh0RggMk6zNMs/lGok8MtE1MCJ0azd2qgElU2Ecaaeu/Cm1E7BLvytdtseh/xKgssD1vUwGO+9ZmI4k3tnz3/6Y3b+N8koG7eH0uCp3CSmr0H7NijQRYaO0gV8wPhtvC5CdS6lJIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kwjNyyNm; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kwjNyyNm" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-914bfa75911so607302385a.1 for ; Wed, 27 May 2026 12:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779911300; x=1780516100; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DzZhwVxQtOTxpPSV3ALvJKs3yCJTXAKgHjmBscK7oNc=; b=kwjNyyNm7NSJr05BtTghuEWIGyCXiQzkQBYeLthAMBu+sRjxORQgxPG0MWWdbdmSyM 9gLVUN74jD0QG33osD9ilHrJOlNc1mBtblJpDJI7ZDqcnV3wjlecuQBYFAELqO0nC/qI bo7X2GZ+af8+uFp183LVXcnMWK/Q4TahtdCznOLMYNIAFvq7zedjSf8rgtSf51Badyfd 8tO/qO/zUDVZEtQvy6BgZGFRr4xrvfkppEYr0RVwxyKnC7hNA3U60ah2ebNeXKoAXCKx Y3vhVWR3DNWrB3L5dR6nmWszMqX4d7KMj1aLq0xdxkGJCMKLAaWWhB1fNOGyF2achZKO xyzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779911300; x=1780516100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DzZhwVxQtOTxpPSV3ALvJKs3yCJTXAKgHjmBscK7oNc=; b=qohaBjUi6md5c/53g7g+2qFmN7MZrXewY3MxdOQF+08vP7H/n2glFnv+anJwzLX7Yo 66sIkiie2RabVFB7VjvgEQTXnqVmJcVjOtgmqOS/X7+i1UUqdXlDrsG7NsYK56UnFPeI 132ewM9zOWwXg41HvWtgnXe625rln9phd55FWuuWSwBny6yTNP3zb7jUOuRzScy7XZ6x tjlvvwr318lqRO41jKfH1xmppVvvhjrm40I4yrFjIWPfcvdjXk+m6dpRLDFuA+4JQdia KJ7tiKNjX0WTBII4SeKVqIoJJxxdyvY5kSoWanHr98M4aDX+IajnKafRfgqqIb4V14eS JVXA== X-Forwarded-Encrypted: i=1; AFNElJ+SUYnGMQf6rymA7MFLDDqKJ8/DsPK7ABAOAR3HdrgP4tZpVxvnUQrieWrad6EOlrsHmSp4+f5JIPQA/xA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/TEPfKpO0rUMzKP7Ul4KaJ/g4NqdEeyfUewwHXNZMZwiZ5kT1 uK1mrLr0imfVbzo0Omh9TSgAunxvCoQcJ/Jh+4zPDrViuxheZuJsFOpo X-Gm-Gg: Acq92OG5AOAyg7hHQh6owDWYtHhKmMJ8JUWuU7twv4BF4ONdl5XelVTPiK5NZ9uJWgY X2UM3Uja/jEqANz7y+Ko3zdo83fT9Z46XJn4LVHGsXZF0mo8yPiIzPOXobVPGLM0avHGqwcT45O F8sjlbDFGesQ5at+BKKFVp1ajRjMYcnF9qskGw5OZmpPdYqugXFiE+Nuni8Q+3WY35jEEvBClow 7WNwdKa1bzgK6QVxHK3fqw3/6ZrMZkHutuGNkSxTesmDACQ0d24KQZTZCnnhN0niNouQ/oc78UY gVnMqOaV+5FhaAn4yeLEVD5k09Alb4B8OdvioC7WHItz/sUUNtjfaqrPejrpD4vdIwKIZqA8Naa MlShAIw6bkV2LiWmi8JoL+8gi6QsQDKPiIbtPMo60EDAPFQP4LfIsybpMgAcLDwUZITi1zheCIZ RLrLEbBvT0o9FDlUq4bLfj6S/pmOFv9iqxmaHhkK1cUkCcS7B30Cz/bOy82X+EwYKM6syZJrw8u IPz3j0OeP0ZWsO8HgdzQ/WtZMdilmNVyojAXaOq9UMZ7N1tcWDvASnn1knhf2H7 X-Received: by 2002:a05:620a:462c:b0:910:f8b4:8614 with SMTP id af79cd13be357-914b51668bdmr3081086285a.31.1779911300034; Wed, 27 May 2026 12:48:20 -0700 (PDT) Received: from server0.tail6e7dd.ts.net (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-914f87017a0sm564942385a.15.2026.05.27.12.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 12:48:19 -0700 (PDT) From: Michael Bommarito To: Detlev Casanova , Ezequiel Garcia , Mauro Carvalho Chehab Cc: Hans Verkuil , Nicolas Dufresne , Heiko Stuebner , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 3/3] media: rkvdec: hevc: guard INTER_REF_PIC_SET_PRED index underflow Date: Wed, 27 May 2026 15:47:37 -0400 Message-ID: <20260527194737.1999409-4-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260527194737.1999409-1-michael.bommarito@gmail.com> References: <20260513181922.2075438-1-michael.bommarito@gmail.com> <20260527194737.1999409-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" st_ref_pic_set_prediction() computes the reference RPS index as st_rps_idx - (delta_idx_minus1 + 1) per HEVC spec equation 7-59. Both operands are u8, so when delta_idx_minus1 + 1 exceeds the current index the subtraction wraps and the subsequent array access at calculated_rps_st_sets[ref_rps_idx] reads far out of bounds. A userspace V4L2 client that can open the RKVDEC m2m decoder can submit an EXT_SPS_ST_RPS control with INTER_REF_PIC_SET_PRED set and delta_idx_minus1 crafted to trigger the underflow. Reject the entry early when the reference index would underflow. Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 varia= nt") Cc: stable@vger.kernel.org Suggested-by: Detlev Casanova Assisted-by: Claude:claude-opus-4-7 Signed-off-by: Michael Bommarito --- drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/= drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c index 3119f3bc9f98b..898d1ce74f38a 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -268,6 +268,9 @@ static void st_ref_pic_set_prediction(struct rkvdec_hev= c_run *run, int idx, int i, j; int dPoc; =20 + if ((unsigned int)rps_data->delta_idx_minus1 + 1 > idx) + return; + ref_rps_idx =3D st_rps_idx - (rps_data->delta_idx_minus1 + 1); /* 7-59 */ delta_rps =3D (1 - 2 * rps_data->delta_rps_sign) * (rps_data->abs_delta_rps_minus1 + 1); /* 7-60 */ --=20 2.53.0