From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 0D8B231A7E4 for ; Wed, 17 Jun 2026 02:19:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781662784; cv=none; b=Ljpsk+BWr3mYDdWAS8hXR8otBZr3HhRJEbFb/ZIeGyL5FhzIWEN1WhULgLwaIelV03nyJt7PmGLG/TqFdRMJR+LsLc2WMi3CXitWBdAfdyeEe2zYT8eJlRI1oVquIPMJbFq0m44M9uBcJuYNgyOYyCdeRE9fFLxOkCTwOKRfomo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781662784; c=relaxed/simple; bh=/xoZPm1Cn9syxIHKnalOBoCsPhZrvdApypT5RqFCzoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gVA4bRAKvKow1m+cQIpE1ob0pgDZwbwJx3ZqFLkawOpyWTvlL23TlyW/xCdN/RnUYQ7mNSLQNRGv9n7qZrW4T+8oRd0CrNRS51f1QVU7rMGzN9Ah/0eJB3yAicKZ1UfWysUpi9V/lUcY0A8umPYdwIT+aCEa3xBhxYH5bsQYZyk= 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=iLjO7mkN; arc=none smtp.client-ip=209.85.222.171 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="iLjO7mkN" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-9157d3f2098so615239485a.3 for ; Tue, 16 Jun 2026 19:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781662782; x=1782267582; 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=nliXYvoRQ3wSjHuqpNr9lxWmoUaal/xuLZ8F2phbi/s=; b=iLjO7mkNFRUDYCwBOZXWILk9/PyMJa2xK0FhA/cGo0nYvxiS5AwrS1KrfTJpOPl7Jy a/JjVQ5wlLISxAWKTCFbHUZMSz4gcRP6Iv6MNm5lXGrhg7PL0K4kjxjAcJR3gtpuyJg5 M64Pfq7KgDrRRqbtQrpH4Ft00E7gfQbNAZkys5obwUnsEZpLFASgdXzhqXsCqE1rF4sk B21OwMHrz2Ha71NSV45uOPYV70lHtAmN2SFCv+2RsEtHifSGJxAy/30kD/Di8XeQO3sU wGv9DnhFPUVK1uVLZR9BY7NhlEROxi7cFRE7PtkPj2zGy7UewTRzT+2kMreD+6OpFjnp u4Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781662782; x=1782267582; 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=nliXYvoRQ3wSjHuqpNr9lxWmoUaal/xuLZ8F2phbi/s=; b=kgdjwkS0etERN3B/f8uIiE8aHk+RBHtIkHJOmtQCbTV+/iiYy9rPfnw39FUZEk68vH RPe5vM712CAQlyQDVphka534evlMCeGfLdwdPWavUQgISEc9PCWlaSu3K01SQgGfcNzy TmKyENgmemMrjRAQcY0xKDl7hd0tcWC/+Dpn8uF6txEfOTW7SXdVl7SV9BkBRwcyx4iq 37ps67SLIb6SML1tG6wq11BlluH4MAvbfIxc/39aJPDzqswXk17+k8KQzhdnSQ5m5PGW FMPOtBkiKqhyJ7Ta0+IGw1SYMML3yItoWMoiFpu8gObIm7T9JvLiQQOS0tmMOIpNNKHd jNCQ== X-Forwarded-Encrypted: i=1; AFNElJ9DdHi/2duINHpuKHXPMIJtRa0m6zwDsTSduqkjEo2AsUTPDHnPFFFhYBps2q1xehs4Tx3xdwCMfSZ25q4=@vger.kernel.org X-Gm-Message-State: AOJu0Ywf63TqCjNzfuDTw3wY/SoZxwF+hjntzZ0tlVwcsggBR8Nf+iu0 Z0eSBgdxLVMLiHHsi5tnsy2Q5Mn02SFRCG4gEthi0fZ/gUvqin8hDXth X-Gm-Gg: Acq92OEzgadg/GN/aQgUWGYEgqeGDhXCbSr+yE3vNdkje0yBfAjTS5FjhBGIPfN0aiL l1dwLmhVQlq6W8MpSP2vJZrgX2Eb+fswiDgJqRqM/QfMhq3pvbCPTWTofkp1YKNzrqyHT5UB0cB DphZONRFGQdJ+Q3bwLG1LmeEuzpZloUmywx7uK94sH5/xu8CmCUMyHgADdzVj7KbntxPJ4Ujjgv +3pHghuaRdSKdeHRBHQtcqxaA9gQ39TQPJwijXzFzvZ83xi7F6lr0OfoTROsRhz8mcoz2Oefcll J3Uuy1cuYkP/FXzFsnu+B/ssinIaNYy7+WUb2ZHyakN/yzNcOI4R83v9sY34Og066MWH7zCi11/ xZ8qA+7Umwtxz0cIWg8JefHyP6RJBi6XpUCf3tp91AgYVEPN6qvJ6LlD+nEPrahn2xyV+O07dbY ga/+R5MNkReI0+pq1/nTqkxEEQFL36X0hj5qckn24kUngvqWWPvgRYzg1vkNom5KqvU/zNEppXt cHwLYOpHFcIAL1I0eBrpzkQEfxPbt4edQDURfKNVs0= X-Received: by 2002:a05:620a:258d:b0:915:8f76:8029 with SMTP id af79cd13be357-91dbc52d1b4mr268487985a.44.1781662782028; Tue, 16 Jun 2026 19:19:42 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 19:19:41 -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 9/9] media: v4l2-ctrls: add KUnit tests for compound control tile validation Date: Tue, 16 Jun 2026 22:19:06 -0400 Message-ID: <20260617021906.2746743-10-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 Add KUnit coverage for the HEVC and AV1 tile-count checks in std_validate_compound(): in-range counts pass, out-of-range per-dimension counts and an AV1 grid whose product exceeds V4L2_AV1_MAX_TILE_COUNT are rejected, and the zero-initialised AV1 frame control that userspace submits still passes. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Michael Bommarito --- drivers/media/v4l2-core/Kconfig | 12 ++ .../media/v4l2-core/v4l2-ctrls-core-test.c | 145 ++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls-core.c | 4 + 3 files changed, 161 insertions(+) create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-core-test.c diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig index d50ccac9733cc..52c00dfe9322f 100644 --- a/drivers/media/v4l2-core/Kconfig +++ b/drivers/media/v4l2-core/Kconfig @@ -3,6 +3,18 @@ # Generic video config states # +config V4L2_CTRLS_KUNIT_TEST + bool "KUnit tests for V4L2 compound control validation" if !KUNIT_ALL_TESTS + depends on VIDEO_DEV && KUNIT=y + default KUNIT_ALL_TESTS + help + This builds KUnit tests for the stateless-codec compound control + validation in std_validate_compound(). They check that out-of-range + HEVC and AV1 tile counts are rejected before the stateless decoders + consume them as loop bounds and array indices. + + If unsure, say N. + config VIDEO_V4L2_I2C bool depends on I2C && VIDEO_DEV diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core-test.c b/drivers/media/v4l2-core/v4l2-ctrls-core-test.c new file mode 100644 index 0000000000000..c0141f3defa82 --- /dev/null +++ b/drivers/media/v4l2-core/v4l2-ctrls-core-test.c @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * KUnit tests for HEVC/AV1 tile-count validation in std_validate_compound(). + * #included at the end of v4l2-ctrls-core.c to reach the static helper. + */ + +#include + +static int call_validate_compound(enum v4l2_ctrl_type type, void *payload, + u32 elem_size) +{ + struct v4l2_ctrl ctrl = { + .type = type, + .elem_size = elem_size, + }; + union v4l2_ctrl_ptr ptr = { .p = payload }; + + return std_validate_compound(&ctrl, 0, ptr); +} + +/* HEVC PPS: num_tile_columns_minus1 / num_tile_rows_minus1 bounds. */ +static void v4l2_ctrls_hevc_pps_tile_cols(struct kunit *test) +{ + struct v4l2_ctrl_hevc_pps *pps; + + pps = kunit_kzalloc(test, sizeof(*pps), GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, pps); + + pps->flags = V4L2_HEVC_PPS_FLAG_TILES_ENABLED; + + /* In range: count == array capacity (minus1 == capacity - 1). */ + pps->num_tile_columns_minus1 = ARRAY_SIZE(pps->column_width_minus1) - 1; + pps->num_tile_rows_minus1 = ARRAY_SIZE(pps->row_height_minus1) - 1; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_HEVC_PPS, pps, + sizeof(*pps)), + 0); + + /* Out of range: one past the column array. */ + pps->num_tile_columns_minus1 = ARRAY_SIZE(pps->column_width_minus1); + pps->num_tile_rows_minus1 = 0; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_HEVC_PPS, pps, + sizeof(*pps)), + -EINVAL); + + /* Out of range: maximal attacker value. */ + pps->num_tile_columns_minus1 = 0xff; + pps->num_tile_rows_minus1 = 0xff; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_HEVC_PPS, pps, + sizeof(*pps)), + -EINVAL); +} + +/* AV1 frame: tile_cols / tile_rows upper bounds. */ +static void v4l2_ctrls_av1_frame_tile(struct kunit *test) +{ + struct v4l2_ctrl_av1_frame *f; + + f = kunit_kzalloc(test, sizeof(*f), GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, f); + + /* + * Benign control: a zero-initialised frame (tile_cols == 0) must + * still pass. Userspace and v4l2-compliance set the zeroed default, + * and the divisor that a zero tile_cols would feed is guarded in the + * consuming driver rather than rejected here. + */ + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + 0); + + /* In range: a 1x1 tiling. */ + f->tile_info.tile_cols = 1; + f->tile_info.tile_rows = 1; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + 0); + + /* + * In range: total tiles == V4L2_AV1_MAX_TILE_COUNT with each + * dimension at or below its per-dimension maximum (64 * 8 == 512). + */ + f->tile_info.tile_cols = V4L2_AV1_MAX_TILE_COLS; + f->tile_info.tile_rows = V4L2_AV1_MAX_TILE_COUNT / V4L2_AV1_MAX_TILE_COLS; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + 0); + + /* + * Out of range: each dimension is legal on its own but the product + * exceeds V4L2_AV1_MAX_TILE_COUNT (64 * 64 == 4096 > 512), which would + * overflow the per-tile descriptor buffers. + */ + f->tile_info.tile_cols = V4L2_AV1_MAX_TILE_COLS; + f->tile_info.tile_rows = V4L2_AV1_MAX_TILE_ROWS; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + -EINVAL); + + /* Out of range: tile_cols past the array. */ + f->tile_info.tile_cols = V4L2_AV1_MAX_TILE_COLS + 1; + f->tile_info.tile_rows = 1; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + -EINVAL); + + /* Out of range: maximal attacker value. */ + f->tile_info.tile_cols = 0xff; + f->tile_info.tile_rows = 0xff; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + -EINVAL); + + /* Out of range: tile_rows past the array. */ + f->tile_info.tile_cols = 1; + f->tile_info.tile_rows = V4L2_AV1_MAX_TILE_ROWS + 1; + KUNIT_EXPECT_EQ(test, + call_validate_compound(V4L2_CTRL_TYPE_AV1_FRAME, f, + sizeof(*f)), + -EINVAL); +} + +static struct kunit_case v4l2_ctrls_test_cases[] = { + KUNIT_CASE(v4l2_ctrls_hevc_pps_tile_cols), + KUNIT_CASE(v4l2_ctrls_av1_frame_tile), + {} +}; + +static struct kunit_suite v4l2_ctrls_test_suite = { + .name = "v4l2-ctrls-compound", + .test_cases = v4l2_ctrls_test_cases, +}; + +kunit_test_suite(v4l2_ctrls_test_suite); + +MODULE_DESCRIPTION("KUnit tests for V4L2 stateless-codec compound control validation"); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c index fb20ad13dfec7..1409b06eee0a8 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -2860,3 +2860,7 @@ int v4l2_ctrl_new_fwnode_properties(struct v4l2_ctrl_handler *hdl, return hdl->error; } EXPORT_SYMBOL(v4l2_ctrl_new_fwnode_properties); + +#if IS_ENABLED(CONFIG_V4L2_CTRLS_KUNIT_TEST) +#include "v4l2-ctrls-core-test.c" +#endif -- 2.53.0