From nobody Fri Apr 3 02:58:25 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC87C27C84E; Fri, 20 Feb 2026 08:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771575309; cv=none; b=FAP8EVwCEmrsy2yvU/8zhuUD8UmlbCN1eKckqNKWolbFPaIZD8ztOSJl+ExVDZXS8vihaHlyug5kfOJWn2RsAbpm2G7YPKi9eTgGmap8w+4LRyLtRI17y4xp+Dmf0tKyP7Xh/1Pi+zITv3OBt9rnJ1KJv1YoaiD5Dfk6Qx0DoOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771575309; c=relaxed/simple; bh=g/dKe7ealZ2Roz+w0mia01uKOCP+aV0TUZ6SoON1WvU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PSQGsF13CJvPuC+KxxOgYg62j89GQpZficTF1ig+1tt13CMP4ea6QXvuTFBdLjqbNlCZTGHapcLhnQCW/BL+oN1vMynscy28vqAH82Z/vIOLci8aJlaGR7EjgV7dLQRfyI7ymrBe7afcRGZWkBmgRqp92aKAgZ/T+pPPrjLubiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m7WmexyX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="m7WmexyX" Received: by smtp.kernel.org (Postfix) with ESMTPS id 71332C19424; Fri, 20 Feb 2026 08:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771575309; bh=g/dKe7ealZ2Roz+w0mia01uKOCP+aV0TUZ6SoON1WvU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=m7WmexyXFUpR564zdYVzl0jpUfbGWki2B868oYV9SvP2w1U978QnEU+GW/KUkUFYZ prX5H9PAGydDhOh4KN1gPMr2PqzkZkVAQMj9UI4X8bfBc7aeMWIoiwdgEa04Wrc0l/ yNuH6GewHmQviG/dBWIgjvPYDLXtRft6D50lWpw715FYHiSYeVE9mmd1SBVUGMqfKT H7aZ6biFyUAkgLcPMwP1rpQNTOiFxSZvMeLgshLqOB/UbQOVLT2Zjd58HatB8FNYfJ XilNxGFXx446icJCucRLLpWX8LPiFVX8d37QjNTDi/k023SdGPplo65P9bgf0DJaQa vCcQMYv6sIb6Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CE4EC54FD4; Fri, 20 Feb 2026 08:15:09 +0000 (UTC) From: Michael Riesch via B4 Relay Date: Fri, 20 Feb 2026 09:15:07 +0100 Subject: [PATCH v2 1/2] media: rockchip: rkcif: fix off by one bugs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260216-rkcif-fixes-v2-1-ee40931fe0ff@collabora.com> References: <20260216-rkcif-fixes-v2-0-ee40931fe0ff@collabora.com> In-Reply-To: <20260216-rkcif-fixes-v2-0-ee40931fe0ff@collabora.com> To: Dan Carpenter , Paul Elder , Laurent Pinchart , Mehdi Djait , Mauro Carvalho Chehab , Heiko Stuebner , Sakari Ailus , Hans Verkuil , Bryan O'Donoghue Cc: Collabora Kernel Team , stable@kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Riesch , Chen-Yu Tsai X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1771575308; l=2303; i=michael.riesch@collabora.com; s=20250410; h=from:subject:message-id; bh=+CTMmqq/FBf0OUNoxM2h1AJhLJnTaBpUVbDN8g6FJXc=; b=jkqMSDUDANKBRHHyuTdC4NY7nDzfs9Wzk6LdU8E0ORJ+OVHx360FP8JRfy5VTJk4vVrWWJ7MQ HVgUvXIym14CwVEQA2gWZ/Cq0XPnkiR8U22M7NCl4m2YbgLdCjOcg6X X-Developer-Key: i=michael.riesch@collabora.com; a=ed25519; pk=+MWX1fffLFZtTPG/I6XdYm/+OSvpRE8D9evQaWbiN04= X-Endpoint-Received: by B4 Relay for michael.riesch@collabora.com/20250410 with auth_id=371 X-Original-From: Michael Riesch Reply-To: michael.riesch@collabora.com From: Dan Carpenter Change these comparisons from > vs >=3D to avoid accessing one element beyond the end of the arrays. While at it, use ARRAY_SIZE instead of the _MAX enum values. Fixes: 1f2353f5a1af ("media: rockchip: rkcif: add support for rk3568 vicap = mipi capture") Cc: stable@kernel.org Signed-off-by: Dan Carpenter Reviewed-by: Michael Riesch Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Tested-by: Chen-Yu Tsai [fix cosmetic issues] Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c b/d= rivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c index 1b81bcc067ef..9e67160a16e4 100644 --- a/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-mipi.c @@ -489,8 +489,8 @@ static inline unsigned int rkcif_mipi_get_reg(struct rk= cif_interface *interface, =20 block =3D interface->index - RKCIF_MIPI_BASE; =20 - if (WARN_ON_ONCE(block > RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) || - WARN_ON_ONCE(index > RKCIF_MIPI_REGISTER_MAX)) + if (WARN_ON_ONCE(block >=3D ARRAY_SIZE(rkcif->match_data->mipi->blocks)) = || + WARN_ON_ONCE(index >=3D ARRAY_SIZE(rkcif->match_data->mipi->regs))) return RKCIF_REGISTER_NOTSUPPORTED; =20 offset =3D rkcif->match_data->mipi->blocks[block].offset; @@ -510,9 +510,9 @@ static inline unsigned int rkcif_mipi_id_get_reg(struct= rkcif_stream *stream, block =3D stream->interface->index - RKCIF_MIPI_BASE; id =3D stream->id; =20 - if (WARN_ON_ONCE(block > RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) || - WARN_ON_ONCE(id > RKCIF_ID_MAX) || - WARN_ON_ONCE(index > RKCIF_MIPI_ID_REGISTER_MAX)) + if (WARN_ON_ONCE(block >=3D ARRAY_SIZE(rkcif->match_data->mipi->blocks)) = || + WARN_ON_ONCE(id >=3D ARRAY_SIZE(rkcif->match_data->mipi->regs_id)) || + WARN_ON_ONCE(index >=3D ARRAY_SIZE(rkcif->match_data->mipi->regs_id[i= d]))) return RKCIF_REGISTER_NOTSUPPORTED; =20 offset =3D rkcif->match_data->mipi->blocks[block].offset; --=20 2.39.5