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 3FDAA199389; Thu, 6 Jun 2024 14:09:58 +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=1717682998; cv=none; b=Eyw1+o2dz1CBO5CZ7Zhu4rKoC54QyGNtDBQGjpgrgBTBnFbehDWNqR5BH7A7ft1duL+bGI0oLi1jr3DcIk33/FVEa1fLbGFklIoblj8T8dU3sT3lu0aYb21ExybqFP4yhUo32bWJHkMe3HubWZ+5rWrP+epoM2Ut+4eMP+ZcSSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682998; c=relaxed/simple; bh=Ly7nqzAMIOIfjBefE2GxJEzZv2e3ujLcqEN4N+QjGA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OOHOjtDbToL9RAE2PrG/ky0dEs7ScbZ8n7KvF6+259LRUe3ErlqYHHFb3uOBQfNMVnnQIyV+m3/WepsYI6PM9QRe09nJpt65JAlOuUXVrN3H+uZBDEY6JYkmriSLubJT3qaWal/RXZ0uAtNGeH6KLcYc+B77Bc/alCfG4+DtQjQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=K3D3nbOP; 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="K3D3nbOP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20F6FC2BD10; Thu, 6 Jun 2024 14:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682998; bh=Ly7nqzAMIOIfjBefE2GxJEzZv2e3ujLcqEN4N+QjGA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K3D3nbOPjngZzxm8Y52LNeJpbfugNveHBktFPZn5+Qyf608zfr6RIziNfEC+mlhjB p+VnQZtlZi2BNMGIMltXeH2Z48GuK7ycbCWc/VWmc1U+n3ZkhJjbHC4SBDBFb9y+4d gzBxMWyDJ4ckSgR+7G5FgHS2eQfV7LrpbdFzhsL8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans Verkuil , "Yang, Chenyuan" , Mauro Carvalho Chehab , Sasha Levin , Yang Subject: [PATCH 6.9 199/374] media: cec: cec-api: add locking in cec_release() Date: Thu, 6 Jun 2024 16:02:58 +0200 Message-ID: <20240606131658.509912768@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans Verkuil [ Upstream commit 42bcaacae924bf18ae387c3f78c202df0b739292 ] When cec_release() uses fh->msgs it has to take fh->lock, otherwise the list can get corrupted. Signed-off-by: Hans Verkuil Reported-by: Yang, Chenyuan Closes: https://lore.kernel.org/linux-media/PH7PR11MB57688E64ADE4FE82E658D86DA09EA@PH7PR11MB5768.namprd11.prod.outlook.com/ Fixes: ca684386e6e2 ("[media] cec: add HDMI CEC framework (api)") Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/cec/core/cec-api.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/cec/core/cec-api.c b/drivers/media/cec/core/cec-api.c index 67dc79ef17050..d64bb716f9c68 100644 --- a/drivers/media/cec/core/cec-api.c +++ b/drivers/media/cec/core/cec-api.c @@ -664,6 +664,8 @@ static int cec_release(struct inode *inode, struct file *filp) list_del_init(&data->xfer_list); } mutex_unlock(&adap->lock); + + mutex_lock(&fh->lock); while (!list_empty(&fh->msgs)) { struct cec_msg_entry *entry = list_first_entry(&fh->msgs, struct cec_msg_entry, list); @@ -681,6 +683,7 @@ static int cec_release(struct inode *inode, struct file *filp) kfree(entry); } } + mutex_unlock(&fh->lock); kfree(fh); cec_put_device(devnode); -- 2.43.0