From mboxrd@z Thu Jan 1 00:00:00 1970 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: 7bit 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 variant") 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_hevc_run *run, int idx, int i, j; int dPoc; + if ((unsigned int)rps_data->delta_idx_minus1 + 1 > idx) + return; + ref_rps_idx = st_rps_idx - (rps_data->delta_idx_minus1 + 1); /* 7-59 */ delta_rps = (1 - 2 * rps_data->delta_rps_sign) * (rps_data->abs_delta_rps_minus1 + 1); /* 7-60 */ -- 2.53.0