From mboxrd@z Thu Jan 1 00:00:00 1970 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 78FE01C7287; Mon, 14 Oct 2024 15:29:50 +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=1728919790; cv=none; b=jmGzU1pROr93pRaB9E9hM2zKUZNGLci9NJPXrJfO4eMZ3ewdh55WvINSBrCfW/VYeEqEgNba7t1aYNkMQ+tDwwwSUocpSilgNvOJZYZOxYmUMIJdlmJQIo0zJrZL/S+Rm0RKqwid8MFCPkA8O+eKmft+f0pbVJ9bh0e86hX6yyo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919790; c=relaxed/simple; bh=s5zTe5ptkhBSepBFgLtJEnD1w8kjCDzw0VXGwWfcDGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J81Q7h70Da4/5e79HpnI/IjIScV7mz/BB7PdpkjjvvwD447jZXpX7kWW2Axy+UTNXEPwqs+14/ym7LZWmD9vjDv6aqfUVjJZGEgDv0+ZD+A5vQuVlJ5tUuiSgW1d5LpYSD9bnhBPaBHm66z9c4rqMoO92+g21QaBnWwr+OizJDc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TTE3bHnV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TTE3bHnV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCF42C4CEC3; Mon, 14 Oct 2024 15:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919790; bh=s5zTe5ptkhBSepBFgLtJEnD1w8kjCDzw0VXGwWfcDGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TTE3bHnVYybv3iUyolRW8UmZsfd2Vxx8x5lzaLC8haINy8N6Ra4FzjI+o4MX0LB6T 4kKkjWFdiVTJg9lXSdkI3TKP28/ff+ofb52hD+IIOARYU/r1fcDbTK1IwrWdVcb2OB XP99pxVvUlhbrhr4g/p0aAkKwOOhaP24ZqR2+f4k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yunke Cao , Tomasz Figa , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1 708/798] media: videobuf2-core: clear memory related fields in __vb2_plane_dmabuf_put() Date: Mon, 14 Oct 2024 16:21:02 +0200 Message-ID: <20241014141245.883835469@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yunke Cao [ Upstream commit 6a9c97ab6b7e85697e0b74e86062192a5ffffd99 ] Clear vb2_plane's memory related fields in __vb2_plane_dmabuf_put(), including bytesused, length, fd and data_offset. Remove the duplicated code in __prepare_dmabuf(). Signed-off-by: Yunke Cao Acked-by: Tomasz Figa Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/common/videobuf2/videobuf2-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 92efc4676df6d..a50a1f0a7342c 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -302,6 +302,10 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p) p->mem_priv = NULL; p->dbuf = NULL; p->dbuf_mapped = 0; + p->bytesused = 0; + p->length = 0; + p->m.fd = 0; + p->data_offset = 0; } /* @@ -1310,10 +1314,6 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) /* Release previously acquired memory if present */ __vb2_plane_dmabuf_put(vb, &vb->planes[plane]); - vb->planes[plane].bytesused = 0; - vb->planes[plane].length = 0; - vb->planes[plane].m.fd = 0; - vb->planes[plane].data_offset = 0; /* Acquire each plane's memory */ mem_priv = call_ptr_memop(attach_dmabuf, -- 2.43.0