Received-SPF: pass (google.com: domain of linux-kernel+bounces-60511-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Hsia-Jun Li <randy.li@synaptics.com>
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org,
	hverkuil-cisco@xs4all.nl,
	sebastian.fricke@collabora.com,
	nicolas.dufresne@collabora.com,
	alexious@zju.edu.cn,
	ayaka@soulik.info,
	linux-kernel@vger.kernel.org,
	"Hsia-Jun(Randy) Li" <randy.li@synaptics.com>
Subject: [PATCH] media: v4l2-mem2mem: fix mem order in last buf
Date: Sun, 11 Feb 2024 02:04:06 +0800
Message-ID: <20240210180414.49184-1-randy.li@synaptics.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?DzL/PCbwhmDYBGyrTSkwLX0R8Il1/9rnSRBDLK/9csjUup6P9dUA1hWBISRG?=
 =?us-ascii?Q?mcqWDWX2U25eeME3FD0uRJW+HgNa/2hEJEXSv6GIygN3cdK1YpwGMIqgeZAc?=
 =?us-ascii?Q?6+IJCb1/kQ+ETe8Fp94QfTlRkBWJZD8eNJ2tE2arh5HCLGU49ZlFV69QI7eY?=
 =?us-ascii?Q?GG6LJap4QLUIV50yXYNefAJkz7/r6xdReCKoQ7xV0G1twD6nMmvFl0OupFvS?=
 =?us-ascii?Q?0Zb87VwIkKcGlv+BRJAJCpVmf9NOmK1XcZDVc9rZqlD7hxEJ83YqRVTyQvcn?=
 =?us-ascii?Q?5WGLAffLzvaQ3QzFX9GbUoPVVPjIbhN+t4G2vf+6rcKMNQ7hSpN5OApNP8sy?=
 =?us-ascii?Q?9VT6rM6GQBpSqyP+dMOAFV8epXl63C+mAYCLunrLZOui6o/Z85ANKo1/z6v7?=
 =?us-ascii?Q?EFw1ft+YlaCzYODWQyFhVBJFwSWrxD/N5qDBL8Me/B1AgwxWqxgL10JPDwMM?=
 =?us-ascii?Q?GcHRcKUphj3UH8MEJHtwl441SRopg08132aC/KKyP5xd0IvrNFFmmQV3eNpo?=
 =?us-ascii?Q?Ffk+o2CvoKTf2exJswLuqRU1dDFY/eLfGFNbrTqOFQQc/RveMurMroD8C41N?=
 =?us-ascii?Q?HNlRlBq36jdDbVqVIXVKgQrDxfhg/XJjZqS1gS/IMUkdwmMsVvE9fPcB6If2?=
 =?us-ascii?Q?UNoRoNyi9idIDznQGoHKHTHodnCy8o5R7CTNHA3jxZj4tDWIE/rMYtW3xWvS?=
 =?us-ascii?Q?kIiELIDIYc9SNjVJyaEI/ZD1GC3Jk78xR01NwvizwXTZpR6oGBeR8nEMNlOq?=
 =?us-ascii?Q?3/dlXpTYmOocyxCMJsxZ/6wYusk8NNAhvloKa+Iure6wA0lJucjVKHOkGQDP?=
 =?us-ascii?Q?rlh140lADph5eRBdHk/HoiG22B4fEsT58H37nd8d92BhTGwq7nlE+CmTk9m0?=
 =?us-ascii?Q?79aNCDbnCIAX9W+/uhirb0Y5cL6FheoRMNSeJq4ykURvSdXUmr/tWqnQpxpE?=
 =?us-ascii?Q?I0u54Hns1ApUID+i3sPIuS4IqxhsCNNFr63fvflnTFk1WLLgNTqqr6MzPMXh?=
 =?us-ascii?Q?eFvuj2wy/wF4qeucMf+fcHSaSfN3L8NXOrQ9MtQAkHa5U2TYhMz/ImXmQCq4?=
 =?us-ascii?Q?6n1t2xiWlp87Ka+RT3HuO5V4TIAvaVz2psBbRbWzmFFjajncrHZtg3UhSbKq?=
 =?us-ascii?Q?2fK20QcFwShh2HjkNx4safsGIFnVHw9ibOmZGYIx3dwDcrcwMZxHiq7tlWUn?=
 =?us-ascii?Q?FyRaB5UUVK1Ny2XcAgsUbpmyEoPSElo7URn5E6FluHCwQxpIDn510IKiqEfM?=
 =?us-ascii?Q?jGclwMqoPW9j+HJ3FvhymOZ7k/N6hkQIUliv7TsYJYOVyQBZY3puhC0XWD2V?=
 =?us-ascii?Q?36YsoLHDL0DFqZWZ6ccwW3nC4Fm9UxqkIZke61t50GSlOg77K/unLJbQNZKE?=
 =?us-ascii?Q?LbLwaG0ppPZksRPpQh/s3+R2h3E0ATSuixBtPMSQP/yHbhzW9wNqVuV7Meuu?=
 =?us-ascii?Q?Vu/Bys5AREQlZdx0fwegsESMU9n/3kZ2wkJ0DD17hyaYWYnTeEKYk8O9Nk72?=
 =?us-ascii?Q?MWLdA6q5F4g41qshiYtBEErZ2fT3/Y6kmM5ROIowiJHqiO8raohjlnm4fPPZ?=
 =?us-ascii?Q?7JbMkkaNTF2WK4Ywqs0l6BkUPqyJYEJjM6YBGR9T?=
X-OriginatorOrg: synaptics.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 62b0772e-3f70-42eb-53bf-08dc2a62c4ab
X-MS-Exchange-CrossTenant-AuthSource: DM6PR03MB5196.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2024 18:04:47.8447
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8Q59CzCR7p3ibx35/SYKVViqxgV5hwJ0AdgwS4jTTEVzgCNcKUPnOfPGU/2d6Kp6vv6RePVKONhsosPIXTW70g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR03MB6102

From: "Hsia-Jun(Randy) Li" <randy.li@synaptics.com>

The has_stopped property in struct v4l2_m2m_ctx is operated
without a lock protecction. Then the userspace calls to
v4l2_m2m_encoder_cmd()/v4l2_m2m_decoder_cmd() may lead to
a critical section issue.

Signed-off-by: Hsia-Jun(Randy) Li <randy.li@synaptics.com>
---
 drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 75517134a5e9..f1de71031e02 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -635,9 +635,9 @@ void v4l2_m2m_last_buffer_done(struct v4l2_m2m_ctx *m2m_ctx,
 			       struct vb2_v4l2_buffer *vbuf)
 {
 	vbuf->flags |= V4L2_BUF_FLAG_LAST;
-	vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
-
 	v4l2_m2m_mark_stopped(m2m_ctx);
+
+	vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
 }
 EXPORT_SYMBOL_GPL(v4l2_m2m_last_buffer_done);
 
-- 
2.17.1