From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 852622EEE7D for ; Wed, 17 Jun 2026 02:19:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781662769; cv=none; b=XOaKhrTVPxQhueczZ6xqNUyRPXq6qsodZZz2t+y8eAIxXC8m+hZ0k7mP3DymNhLZU1JZc0likvylSoA4eVvI8HqQQFlZrHMY21ORm0iP5iCn3WWF0zUSVYkURR34XqXsdaMat45gdi29pC3DkpPnuLIboFhMAzlcxPucjcTy4b0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781662769; c=relaxed/simple; bh=gUMUYpn3PwDj3mjyt/AnF1We3zQA6b0XllB67XsfCmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PdF7p/IqtXQJiaivR+N1R3avGwSPNa6TyEXE7JbeoqPNZOJo7sAcqKSNZQkaP1GOrnxNBBn38BOF0lKzDLdKgEyP+HA1kBg1382n1ax5UoHEz8aQ+TAahXVkn2bi8/xu/02odRYZx9x2BkC5tS1d5ArlSOqBr35xYwyf15UtJCQ= 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=IwC5s4R0; arc=none smtp.client-ip=209.85.222.172 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="IwC5s4R0" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-91588056619so395249885a.2 for ; Tue, 16 Jun 2026 19:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781662767; x=1782267567; 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=XZ9wck5P6r9OGqEQx9lSHX/yZ9cfcypeRcv1sXaGY/s=; b=IwC5s4R0TJItD488d7TXjoGaFfDUf+/+ZfXhp7doCg6U4654DTAgPTysr8bdZ9xmtV wvfZsk0OVxVjrbUJorIrRVAFAlv4Rk9W55PvnQmarbRTLzcrD6CtaBdqnaMCKNnknCWe t6akqG0M6JDzi/iTdkMbBNFUDZyGNP28PKPcmf7X7cxIkJkHoWMPdB3Tusu7Xw8TpEXJ TAFkZTQBcX98kZJIxWzrcYgOLV+4N0Vj2gzqS7YNq0WjC0F2H2+y3MF407XpQ5ycgwPW rZm2c4b2T9ta8/L0xjPc7t70kku/cf107wPBQ67KR6U4Hwavc9xJVsc6IlUgNhuPrKAA JNoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781662767; x=1782267567; 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=XZ9wck5P6r9OGqEQx9lSHX/yZ9cfcypeRcv1sXaGY/s=; b=Oqf04ROmHeCFMV02E/XesC1IbAuEli3HkCb2SqeTrySAeB+YReOv4LYn8i+tMjDwDe aDlXtGTYrf3/WWvrimxf1GDvnc1RwbNGU34wjZk70NpJndGjGDMm0jmOmbEN20AkQC+h vy1ZgnERTrC7AFyiVSY35QHKHGfi2sK6VQw8erMJkjPWl1XWu/50knWM/UWuhtB+C0sj PTAfj2TRWwbmNg4i7ERX4S4sOK6pLAwqZDBd5GRTxQ1htbOhhZhv551c+5AZ6R2qVGzF X3UX5uc01I9H30eV20NczrPoEZWAVS+xkH2jZXGwKNjjy0JzXw70yg5GTJjzodhREj03 mM5w== X-Forwarded-Encrypted: i=1; AFNElJ8mSga8VyoLGZUBK6Y6MtCNzkyh6AadA/DiGmIiy5a8Sf7domUmV3jtxSu1Lerql4yo/v90ufqP0fCjRZg=@vger.kernel.org X-Gm-Message-State: AOJu0Yynny5+lkYzQi3QfpTb+NioOygEJ4pct3hXZW4AYOqMhDWLUEGY SA/fXvHPF1PeR2sTSgqQJUS4LnRsGDXnXP5G5QAvSxoaov4cR/K1EU3E X-Gm-Gg: Acq92OHEs7lwiI1HZUcAByqUldrzDX6BRGZApvRPJUpozqCFc27GrrvhdIGcwRqhYTq jnNNR6GegRP2OyHV5qBFXWxE/q7oQ+zNlJ9m4/ScD1PWopDswzGvWDUqa8Qxp92fBs68cRCgDrS DeCytUoWc5/Ic+rGzMGcUrIRa9PxHlbUevtyUzZU46PiRIM1i/JFYf2GxTegsI93UU2xv3z6hPt HPFn/pbawbDtKVkOzd1r+JehxhStRqz2FOriPzvgfKq1pa45pyKYGeRgH9meniRhYLI8C/H7q5d X1hyQz3Xv+VQqBD5YDUi74O2Kd0szzR29/m31DYG75Bimjq+mihPm9WCecSdnfYtERxyUmgGDLn JTX0oUOUTVPK5VZ/s99DmhBaP61R0eLSrWgksjE6hX8JshJC16BNcWmleM7tgA+HkW0iDY92xjZ DtP2q9C0r25N0VC8RWCpKG8F7YxLq7ODCejz6l5TUdsyxC0F5314Mq2cCReEURF5SrZUE+DPJMt L9pDV9BmnTIHk77rg+x0B6ohqWHrKwK X-Received: by 2002:a05:620a:280a:b0:915:6504:2a11 with SMTP id af79cd13be357-91d8d7a6a6fmr417807285a.44.1781662767410; Tue, 16 Jun 2026 19:19:27 -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-9161a006e35sm1657646285a.28.2026.06.16.19.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 19:19:26 -0700 (PDT) From: Michael Bommarito To: Hans Verkuil , Mauro Carvalho Chehab , Sakari Ailus , Nicolas Dufresne 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 v3 1/9] media: v4l2-ctrls: validate HEVC tile counts Date: Tue, 16 Jun 2026 22:18:58 -0400 Message-ID: <20260617021906.2746743-2-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260617021906.2746743-1-michael.bommarito@gmail.com> References: <20260617021906.2746743-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 The stateless HEVC decoders read num_tile_columns_minus1 + 1 entries from column_width_minus1[] and num_tile_rows_minus1 + 1 from row_height_minus1[] and use them as tile-loop bounds, but std_validate_compound() does not bound these u8 counts. Reject a V4L2_CTRL_TYPE_HEVC_PPS with tiling enabled whose tile counts exceed the uAPI array capacity, mirroring the existing compound-control range checks. Fixes: 256fa3920874 ("media: v4l: Add definitions for HEVC stateless decoding") Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Michael Bommarito --- drivers/media/v4l2-core/v4l2-ctrls-core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c index 6b375720e395c..6d478e1a5ef22 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -1242,6 +1242,18 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, p_hevc_pps->flags &= ~V4L2_HEVC_PPS_FLAG_LOOP_FILTER_ACROSS_TILES_ENABLED; + } else { + /* + * These count the entries the stateless HEVC drivers + * read from column_width_minus1[] / row_height_minus1[] + * and use as tile-loop bounds. + */ + if (p_hevc_pps->num_tile_columns_minus1 >= + ARRAY_SIZE(p_hevc_pps->column_width_minus1)) + return -EINVAL; + if (p_hevc_pps->num_tile_rows_minus1 >= + ARRAY_SIZE(p_hevc_pps->row_height_minus1)) + return -EINVAL; } if (p_hevc_pps->flags & -- 2.53.0