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 646251AB505; Mon, 14 Oct 2024 14:26:14 +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=1728915974; cv=none; b=ZVy9r1CORQpH4lFg8WR4BrSJQMW4dK0fxTbn37kLUlSbIY2fnNI6rLFudnV1oR3j+1Pd76Y6L/ShkRUYZp/I9ifcinySKL+W64N9rMde+A5rzObp/hwSuK6Zl8hJWMQN2PaU9LjBfvwOec7ICf2zITTW9SRe4YynCr5Jai8G0nU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915974; c=relaxed/simple; bh=WLjtRDynmlCAAt6KAHlU1h+MeuiBunfoMqtiYuKB6N0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N0EjyDXtFBJxwL9I7sjPi6x83PZfi5AfTU84kz6LSugb0MJLwFjx+8YY7eVbH87WCJIJYYHTYbdSzH+nGpiB0gdZZqQr1W1MsMR8WeoR+xkAGGakulyGaAVDZZQlJG27f5h6QPG2uqnRGWVNAe3//HVRX80DXdYJVlj04T73xv8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lsv6taRk; 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="lsv6taRk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3515C4CED5; Mon, 14 Oct 2024 14:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728915974; bh=WLjtRDynmlCAAt6KAHlU1h+MeuiBunfoMqtiYuKB6N0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lsv6taRkfEiBcnEszcps7wypCBMgikDMMgxm7W4KSsozcIqROIoaxflHasB5c9ge8 ptLDWJMTs1kF7FTCYs3hwRnHKPFf3kbJl1ithcYdjJyAVq/EtOYKjLoxRbNT13+HER jbOB85tfUFwIMCtf/6dsB2ju5M1KV86t2qhOa0IY= 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.11 051/214] media: videobuf2-core: clear memory related fields in __vb2_plane_dmabuf_put() Date: Mon, 14 Oct 2024 16:18:34 +0200 Message-ID: <20241014141046.982207440@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141044.974962104@linuxfoundation.org> References: <20241014141044.974962104@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-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 8b0de1cb08808..97605c2e25dac 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -311,6 +311,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; } /* @@ -1420,10 +1424,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