From nobody Fri Apr 3 01:48:26 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 394262FFDD5; Mon, 16 Feb 2026 13:50:01 +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=1771249802; cv=none; b=sCMHBKz9Cl5ozBzz0M9H9fSDIzWN2R6GS/0CFChECsucBIeWN8q5j9hO13wnHiea2gAo5UT7iHIft+4bUEJkA937ZoJGIq6ZNTlkR5kv+GnjtygNxDVdGjbuImSUa6e/8nWKrfNXP7hM1e8d9lToENKNhYdFNY4dbfybEYYsuKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771249802; c=relaxed/simple; bh=odlPpkS2jQgoxF9cQXI0l/s7n/aRhfbeIhr3VuRYmmc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dXal+g1CgKlTU3jQ1PpYPQWwIYD8INet8KSc+SMuiBDGRqo1+931Zhw3n8NqRyXxP5Ygs5tIpydPgXocIoXORbBS/YxbQnZY8zLMZIDzdFxzOP/vLbZHKN6YyAvvF5EWf/VFH0PIQISEtPIT+GJiLuS16gCs9HQ3Pml0SVp5MMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J9qRCSz4; 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="J9qRCSz4" Received: by smtp.kernel.org (Postfix) with ESMTPS id C7BE7C19424; Mon, 16 Feb 2026 13:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771249801; bh=odlPpkS2jQgoxF9cQXI0l/s7n/aRhfbeIhr3VuRYmmc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=J9qRCSz4uO2xiAhR/e/LC++r6btAJ/GBrLgfa+E9BNwZPjcywBWR/XqBlogAtXuw/ 3gXWMQ+KFXW93dmBJlzB6fxfGctorSSLxeZF32SAdW2V/Dx4FIeEuRFsygh3tsl2EB pbFAziaPvoglYvnzjdrVOSjkjHeczCMHjCmEkR5YWaVps0P2nbihJPTCV7/tdjxpqb f7Rqz/jphWJp3kqVC0K44atopq/CjevPsrIfu7yFFAlZms3LtdY984hz7H7ryJQlym 3tF70XFzq6XHnTzEnz3BZPbt9vW1PgQvzoBul2ntlbvRO3xyg7By/a8yHtchq21YAK R+BB/taTCPsTw== 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 B6636E81A20; Mon, 16 Feb 2026 13:50:01 +0000 (UTC) From: Michael Riesch via B4 Relay Date: Mon, 16 Feb 2026 14:49:56 +0100 Subject: [PATCH 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-v1-1-b16db20b6d68@collabora.com> References: <20260216-rkcif-fixes-v1-0-b16db20b6d68@collabora.com> In-Reply-To: <20260216-rkcif-fixes-v1-0-b16db20b6d68@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 X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1771249800; l=1959; i=michael.riesch@collabora.com; s=20250410; h=from:subject:message-id; bh=hY5NYgV0NqG8C6Dk+MwlRTr+tzjGBXH7fs5QS8NeCBo=; b=O2PDUNh9qz7Tr144sCMVHBrtQKPzSzKCM+j/1klR0rZDDnXk4sW8oYnutrggcT354PmwoFrI2 OcXHPtwhNzcBMJ02N1uRkSzwENvfX7zr7kdXzcujXwuCHgXHgmiD65Z 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. 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 Signed-off-by: Michael Riesch Reviewed-by: Laurent Pinchart Reviewed-by: Paul Elder Tested-by: Chen-Yu Tsai --- 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..a933df682acc 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 RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) || + WARN_ON_ONCE(index >=3D RKCIF_MIPI_REGISTER_MAX)) 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 RKCIF_MIPI_MAX - RKCIF_MIPI_BASE) || + WARN_ON_ONCE(id >=3D RKCIF_ID_MAX) || + WARN_ON_ONCE(index >=3D RKCIF_MIPI_ID_REGISTER_MAX)) return RKCIF_REGISTER_NOTSUPPORTED; =20 offset =3D rkcif->match_data->mipi->blocks[block].offset; --=20 2.39.5 From nobody Fri Apr 3 01:48:26 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 44795301037; Mon, 16 Feb 2026 13:50:02 +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=1771249802; cv=none; b=Q5VX2AoPw7L6UUzWOv39yW4ylZ564dt2OVj6i3PCU8NLLnqtgl7olRcGeOdpfIFyoVC8k0v5fO3FZiZ0SRfFRh8Anl/FlY+KkbpIVmjR2xCf3jdyXJbIoFDb5EUayUeZ//GaYEZ+WLbnW2XvKg414gaMYXHeM7KsmenJANJTx0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771249802; c=relaxed/simple; bh=Q1h/qyky6FFnfESCLb5k3aJdZMs2M0rnG3N0gR+NtuI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hJlbSTOZSlQ937CqKYRisHM1+oWxdAQE2P7lL1+/y+oTdPUuSj/BHixTWLiPTsCI12uf0PuTJDHgzt8C/UIy2yb6s5VS8lPTLhGO5uvZv+s0Ogi1BYRPCZ2dVsRNXcPC2xhQVV1vlPG48rFmX/XOTjPitK3lmVXnxyNCALhJCcI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RgmjHTmK; 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="RgmjHTmK" Received: by smtp.kernel.org (Postfix) with ESMTPS id E2FCDC2BC86; Mon, 16 Feb 2026 13:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771249802; bh=Q1h/qyky6FFnfESCLb5k3aJdZMs2M0rnG3N0gR+NtuI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=RgmjHTmKsG5jgvrk5Hjqf+NjQLoG7y10p1StS07yZiSdQhjcFtfqFSniojND6xMLQ PjQDsZeXamt9srZC8A/nHERWiEQvZLKCKXaq3jXuF7VyzFXN5bMKRFrhu10zF0JbyA 5ZkB8gZ3YSKajW39zefhg1NdutBb2zmepFr1smYvHeCUYZoW4t0eiwzWxiEYeJbxNa e0927yRPCTj6mN+WKbch4IyCwRjvR6wfyDbK4H0y6KXuen0ctnm+Rih5mp3zbJtEI0 xuG1dVsDuJhCe02W0i9NILeTTVM6jwFfsbsn0IEmPP5oJCxUi/XL8rT/Cbm1GoyQtW ItTcpAOCu7hQQ== 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 CFA82E81A23; Mon, 16 Feb 2026 13:50:01 +0000 (UTC) From: Michael Riesch via B4 Relay Date: Mon, 16 Feb 2026 14:49:57 +0100 Subject: [PATCH 2/2] media: rockchip: rkcif: comply with minimum number of buffers requirement 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-v1-2-b16db20b6d68@collabora.com> References: <20260216-rkcif-fixes-v1-0-b16db20b6d68@collabora.com> In-Reply-To: <20260216-rkcif-fixes-v1-0-b16db20b6d68@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 X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1771249800; l=2607; i=michael.riesch@collabora.com; s=20250410; h=from:subject:message-id; bh=0nRPaVD70VE4M5NIdqK3Pzeq8YDn4uwgLWyViuJm8KU=; b=PaJdJYi6MOVQOq+Mixf3SunaFC7vawj7W5FBzXafHeZ23AACayRw4D3n7m1b0c8PsgOgrB4Pp nTkIZhDVb6oBfS4slcjeb076DEEEkqVTUe+Lsx2lWilt0/nxjLXSxCs 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: Michael Riesch Each stream requires CIF_REQ_BUFS_MIN=3D1 buffers to enable streaming. However, it failed with only one buffer provided. Comply with the minimum number of buffers requirement and accept exactly one buffer. Fixes: 501802e2ad51 ("media: rockchip: rkcif: add abstraction for dma block= s") Cc: stable@kernel.org Signed-off-by: Michael Riesch Tested-by: Chen-Yu Tsai --- .../media/platform/rockchip/rkcif/rkcif-stream.c | 41 +++++++++++-------= ---- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-stream.c b/drivers= /media/platform/rockchip/rkcif/rkcif-stream.c index e00010a91e8b..5a5ab9e7e86e 100644 --- a/drivers/media/platform/rockchip/rkcif/rkcif-stream.c +++ b/drivers/media/platform/rockchip/rkcif/rkcif-stream.c @@ -106,19 +106,6 @@ static int rkcif_stream_init_buffers(struct rkcif_stre= am *stream) { struct v4l2_pix_format_mplane *pix =3D &stream->pix; =20 - stream->buffers[0] =3D rkcif_stream_pop_buffer(stream); - if (!stream->buffers[0]) - goto err_buff_0; - - stream->buffers[1] =3D rkcif_stream_pop_buffer(stream); - if (!stream->buffers[1]) - goto err_buff_1; - - if (stream->queue_buffer) { - stream->queue_buffer(stream, 0); - stream->queue_buffer(stream, 1); - } - stream->dummy.size =3D pix->num_planes * pix->plane_fmt[0].sizeimage; stream->dummy.vaddr =3D dma_alloc_attrs(stream->rkcif->dev, stream->dummy.size, @@ -132,16 +119,30 @@ static int rkcif_stream_init_buffers(struct rkcif_str= eam *stream) stream->dummy.buffer.buff_addr[i - 1] + pix->plane_fmt[i - 1].bytesperline * pix->height; =20 - return 0; + stream->buffers[0] =3D rkcif_stream_pop_buffer(stream); + if (!stream->buffers[0]) + goto err_buff_0; =20 -err_dummy: - rkcif_stream_return_buffer(stream->buffers[1], VB2_BUF_STATE_QUEUED); - stream->buffers[1] =3D NULL; + stream->buffers[1] =3D rkcif_stream_pop_buffer(stream); + if (!stream->buffers[1]) { + stream->buffers[stream->frame_phase] =3D &stream->dummy.buffer; + stream->buffers[stream->frame_phase]->is_dummy =3D true; + } + + if (stream->queue_buffer) { + stream->queue_buffer(stream, 0); + stream->queue_buffer(stream, 1); + } + + return 0; =20 -err_buff_1: - rkcif_stream_return_buffer(stream->buffers[0], VB2_BUF_STATE_QUEUED); - stream->buffers[0] =3D NULL; err_buff_0: + dma_free_attrs(stream->rkcif->dev, stream->dummy.size, + stream->dummy.vaddr, + stream->dummy.buffer.buff_addr[0], + DMA_ATTR_NO_KERNEL_MAPPING); + stream->dummy.vaddr =3D NULL; +err_dummy: return -EINVAL; } =20 --=20 2.39.5