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 888C03A641F for ; Sun, 14 Jun 2026 13:10:11 +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=1781442614; cv=none; b=oe4ZxnMfYO5o/uLt5mJsSX5zSAo2V9dGSO52s/Qy9LxOgWxxrFnboBVoWqx/q+fGMrJ93N3/JgIoU2estwO/2XB5dRSz0L9fpF0m4jaRHTcfDlnCjpuJ68kBRVP9328H0d+3roFx69uNpNHxZ0aVHodEDHbXf2liT8Tu4V4+GiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781442614; c=relaxed/simple; bh=Ybj0KYCzf4OIpSMi75CotvcIb1E81nyGc8zxOXwWSi4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AGBDd5Wk1KyOJ/wjmDZqLer421kW/XBKkz6hnadmdsBFQ29HGVoi1UbrwnLGSShMNzEMohI2buf/Q6yzSAysOLpu53ra3S8LHPZhEf+QG4La9P7flwjrlWlWXxPE5hpB1wAt+QzmG75AXjmR5N9b6fwMWUWMJ5tbsjPoNKMy6Yo= 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=okXsZc+r; 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="okXsZc+r" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-915e1354934so263951185a.1 for ; Sun, 14 Jun 2026 06:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781442610; x=1782047410; 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=viox6pD1QfsYaMbYifCSfXJ+WEadIZxjJ3+HuLOIzqg=; b=okXsZc+rWYU7ZAx6Gi3PHqpOUOG4ZgoJHHd0WqSnkZFgSzDcO9AeQ8Yw29hUtnHKPf EMmih9TrIGZGZvvHWH939uekYMiDih3M33XM37r8ACJKuk0jH6QTt7eMQsLIVt5daOB/ YgYGe6jpWwASGCDIRlSbtcmO7409hGhPbt1WZJwVmDUDhHMhIEJ37tUSr0H9Cp3TMSYd pFqE4D3zBZIHKTWMJa6C9p+icm//Knd3qELiW4Qj73fWY2AO/6R52xOCwF197SE0gedp xkaqdbXOx8HxX5xkB0iEbQBXPDN6GSg9eyFCO4QY7CCOCqhtEMV/ZFQ9VuLtjt5nkVFA RpaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781442610; x=1782047410; 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=viox6pD1QfsYaMbYifCSfXJ+WEadIZxjJ3+HuLOIzqg=; b=GMgTkDG3zSP+XoqRbMm/GggdTvu9qc8IwGtVLBr3whCjevdwAOrn6WaxVGzKxvz1LU cZNZaFfqoXrZaGQtnNuaPYSYuI1D2bF6tZhu8LCpTqUZV9y5LbjqOdXmUBYYxxp5nui5 kISBkRIn6jfaC88iyqMwbZalti2eJowNH/NCW5A6q6Wsfmr9U7/Cm10Ip+9FVaVMmfge sAvwPW36xlPkVYCH/Yi7Jq1f2DwAl9AT7qwhoJHcdeuZRugtQhYYzq6wv5Ld2aJIy0A1 FZnOxEm/TjqcEFcWSuqIjyp+fEu1+9/I1jid/SWlxGT92cXwh6d3RcazBKsLipjyzMPV g/XQ== X-Forwarded-Encrypted: i=1; AFNElJ/4mKZ+l9yK9SOwJh6RCIyFdD1GJJwf2sARk9mLIzgQWH+WJbRoofWRHgyxQwK8wnXZA5/SvLUcBG8/9wk=@vger.kernel.org X-Gm-Message-State: AOJu0YyM7eG8CnVYAa0NPTPsazJBgRN+MhWu10JW8Mfg6F4D9pKDVDcZ dV2D4Yd8TBWJAgSNyRYirTfOYPLUlWuVRBOO2qwuUR54g2E2KGsrnOZ7 X-Gm-Gg: Acq92OFEJ7kloU4PdMOZMxT41D+BOcz0KLUiax2UQfZyf6zXQW/yIbwgy1pZBcgSKxN Wsjah81lqzjOANwvqxpXQ9kGQe+wl3eTsxxHlD7626lF+3y6NvTh/gwhURf08sOoeuv5cj+4+Yz OQAMqr6IoGLGzJ/59crkJ6iwF51QWAFdLEmbqDkSGJyu/hHO8OHnDorJkZ4cpM6pMeFOitodF1A UENO1pFpdCorqr/7gRL0+iDUCFV8Vpt599BPR56a4sDgkkbq53XYS78MFS9gCZKNMYCaosxa+/k d/dHptL5dBvIgjOLaoKHzdY5guaIu+AHAHt5IvgvbmyZXGh4ax0mjgU3dVSZTHHUdsXWDg4uT6X PkibwJS0PlefXH64NhqZN0mjZ5QNZ2uc3JBO4wrBsjMx8tUy/65+WHk32nD+CVFbIM6H4kWK5HC Pq7ORQUd2iBlwNGzwpHj9HizlRIVsI9C1/DTjewT/Uicv4BQjea47r+VuxtFhXWcOpHnw7mWs3j JUdrLHISis5cHLQWWBG/VwDBlxmyhbsYKgz5zbKlEE= X-Received: by 2002:a05:620a:bc8:b0:915:a73e:3544 with SMTP id af79cd13be357-917f1c56720mr1256745485a.56.1781442610430; Sun, 14 Jun 2026 06:10:10 -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-91619f1b400sm752878985a.15.2026.06.14.06.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 06:10:09 -0700 (PDT) From: Michael Bommarito To: Hans Verkuil , Mauro Carvalho Chehab , Sakari Ailus , Nicolas Dufresne , Sebastian Fricke Cc: Laurent Pinchart , Benjamin Gaignard , Detlev Casanova , Ezequiel Garcia , Yunfei Dong , Jonas Karlman , Heiko Stuebner , Kees Cook , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] media: rkvdec: bound HEVC tile loops and PPS id to the array capacity Date: Sun, 14 Jun 2026 09:09:59 -0400 Message-ID: <20260614131003.2524025-3-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260614131003.2524025-1-michael.bommarito@gmail.com> References: <20260614131003.2524025-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 compute_tiles_uniform() / compute_tiles_non_uniform() and assemble_hw_pps() loop over num_tile_columns_minus1 / num_tile_rows_minus1 to write the per-tile column_width[] / row_height[] arrays, sized to the PPS uAPI arrays column_width_minus1[20] / row_height_minus1[22]; bound the loops to that capacity. assemble_hw_pps() also indexes the fixed param_set[] table by pic_parameter_set_id, a driver-interpreted index the core does not reject; bound it to the table size before the access. Fixes: 3595375c2301 ("media: rkvdec: Add HEVC backend") Fixes: c9a59dc2acc7 ("media: rkvdec: Add HEVC support for the VDPU381 variant") Signed-off-by: Michael Bommarito Assisted-by: Claude:claude-opus-4-8 --- The decoder is an ARM SoC block (Rockchip RK33xx/RK35xx) not reachable on the x86 KUnit host, so the driver-side out-of-bounds write is not reproduced here. .../rockchip/rkvdec/rkvdec-hevc-common.c | 22 +++++++++++++++---- .../platform/rockchip/rkvdec/rkvdec-hevc.c | 8 +++++-- .../rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 2 ++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c index 3119f3b..d0f26f7 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c @@ -37,15 +37,22 @@ void compute_tiles_uniform(struct rkvdec_hevc_run *run, u16 log2_min_cb_size, s32 pic_in_cts_height, u16 *column_width, u16 *row_height) { const struct v4l2_ctrl_hevc_pps *pps = run->pps; + unsigned int num_cols, num_rows; int i; - for (i = 0; i < pps->num_tile_columns_minus1 + 1; i++) + /* Bound the loops to the column_width[]/row_height[] capacity. */ + num_cols = min_t(unsigned int, pps->num_tile_columns_minus1 + 1, + ARRAY_SIZE(pps->column_width_minus1)); + num_rows = min_t(unsigned int, pps->num_tile_rows_minus1 + 1, + ARRAY_SIZE(pps->row_height_minus1)); + + for (i = 0; i < num_cols; i++) column_width[i] = ((i + 1) * pic_in_cts_width) / (pps->num_tile_columns_minus1 + 1) - (i * pic_in_cts_width) / (pps->num_tile_columns_minus1 + 1); - for (i = 0; i < pps->num_tile_rows_minus1 + 1; i++) + for (i = 0; i < num_rows; i++) row_height[i] = ((i + 1) * pic_in_cts_height) / (pps->num_tile_rows_minus1 + 1) - (i * pic_in_cts_height) / @@ -57,17 +64,24 @@ void compute_tiles_non_uniform(struct rkvdec_hevc_run *run, u16 log2_min_cb_size s32 pic_in_cts_height, u16 *column_width, u16 *row_height) { const struct v4l2_ctrl_hevc_pps *pps = run->pps; + unsigned int num_cols, num_rows; s32 sum = 0; int i; - for (i = 0; i < pps->num_tile_columns_minus1; i++) { + /* Leave one slot for the trailing last-tile entry written below. */ + num_cols = min_t(unsigned int, pps->num_tile_columns_minus1, + ARRAY_SIZE(pps->column_width_minus1) - 1); + num_rows = min_t(unsigned int, pps->num_tile_rows_minus1, + ARRAY_SIZE(pps->row_height_minus1) - 1); + + for (i = 0; i < num_cols; i++) { column_width[i] = pps->column_width_minus1[i] + 1; sum += column_width[i]; } column_width[i] = pic_in_cts_width - sum; sum = 0; - for (i = 0; i < pps->num_tile_rows_minus1; i++) { + for (i = 0; i < num_rows; i++) { row_height[i] = pps->row_height_minus1[i] + 1; sum += row_height[i]; } diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c index ac8b825..29b5adb 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c @@ -156,6 +156,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, * packet unit). so the driver copy SPS/PPS information to the exact PPS * packet unit for HW accessing. */ + if (pps->pic_parameter_set_id >= ARRAY_SIZE(priv_tbl->param_set)) + return; hw_ps = &priv_tbl->param_set[pps->pic_parameter_set_id]; memset(hw_ps, 0, sizeof(*hw_ps)); @@ -274,9 +276,11 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, if (pps->flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED) { /* Userspace also provide column width and row height for uniform spacing */ - for (i = 0; i <= pps->num_tile_columns_minus1; i++) + for (i = 0; i <= pps->num_tile_columns_minus1 && + i < ARRAY_SIZE(pps->column_width_minus1); i++) WRITE_PPS(pps->column_width_minus1[i], COLUMN_WIDTH(i)); - for (i = 0; i <= pps->num_tile_rows_minus1; i++) + for (i = 0; i <= pps->num_tile_rows_minus1 && + i < ARRAY_SIZE(pps->row_height_minus1); i++) WRITE_PPS(pps->row_height_minus1[i], ROW_HEIGHT(i)); } else { WRITE_PPS(((sps->pic_width_in_luma_samples + ctb_size_y - 1) / ctb_size_y) - 1, diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c index fe6414a..6dafa1d 100644 --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c @@ -145,6 +145,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, * packet unit). so the driver copy SPS/PPS information to the exact PPS * packet unit for HW accessing. */ + if (pps->pic_parameter_set_id >= ARRAY_SIZE(priv_tbl->param_set)) + return; hw_ps = &priv_tbl->param_set[pps->pic_parameter_set_id]; memset(hw_ps, 0, sizeof(*hw_ps)); -- 2.53.0