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 E3D78335BA3; Mon, 18 Aug 2025 13:52:38 +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=1755525159; cv=none; b=NPWPQ7I5awPUNm+12il7tGFXXmmYAgwZgAIz54f4zWsBRdHT6KOReslEYuEMr+dwHDwgz/HAEKEb2XWdyUYbglBWSw/wQSUwrLj0QCnIQfOfnbHTF9w8W+nQx5OdykCFCOn5jKMgA4mmVWsZB1GzuTNnLJxA7GjGtmG7EBHtGIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755525159; c=relaxed/simple; bh=zguj5kN+ABducMxvpPxFMkhnCkTB1tU/SIQF3vHsz80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IaSh7iaDjt3E0vXmBBvjt1aZ0MZlpCdR+acWRDUmHbZ4BiBwLkHd6RcdpVDymAP3kNrhsPpamDOrClGCOP8YDpqd/YQIsmNCXgRY2ZUGfzDCSR+H4nn4WhypJgNm0Eq2Fd89jO70uyStR5mTCb1JmpoiDkjCSdcjcRXwAJWv3OA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AdeFQv4A; 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="AdeFQv4A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00555C4CEEB; Mon, 18 Aug 2025 13:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755525158; bh=zguj5kN+ABducMxvpPxFMkhnCkTB1tU/SIQF3vHsz80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdeFQv4AfRTwIfj5syAV/s7XyOp/KTE7k0foMWQB75zx1w27lwtdrgX0Rgec5az3t I0zj1hlzilWfiKUmS0RFejKnZQIWSqvVO2xHt8ZPUp7HRff8Folo1wugtE9EbOdgyy bcpJsf+T98Wqf0urGHUR0h8q0C3iwNNBZ/6HSzEg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Sasha Levin Subject: [PATCH 6.16 177/570] mei: bus: Check for still connected devices in mei_cl_bus_dev_release() Date: Mon, 18 Aug 2025 14:42:44 +0200 Message-ID: <20250818124512.617983576@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124505.781598737@linuxfoundation.org> References: <20250818124505.781598737@linuxfoundation.org> User-Agent: quilt/0.68 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.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit 35e8a426b16adbecae7a4e0e3c00fc8d0273db53 ] mei_cl_bus_dev_release() also frees the mei-client (struct mei_cl) belonging to the device being released. If there are bugs like the just fixed bug in the ACE/CSI2 mei drivers, the mei-client being freed might still be part of the mei_device's file_list and iterating over this list after the freeing will then trigger a use-afer-free bug. Add a check to mei_cl_bus_dev_release() to make sure that the to-be-freed mei-client is not on the mei_device's file_list. Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20250623085052.12347-11-hansg@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/misc/mei/bus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index 67176caf5416..1958c043ac14 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -1301,10 +1301,16 @@ static void mei_dev_bus_put(struct mei_device *bus) static void mei_cl_bus_dev_release(struct device *dev) { struct mei_cl_device *cldev = to_mei_cl_device(dev); + struct mei_device *mdev = cldev->cl->dev; + struct mei_cl *cl; mei_cl_flush_queues(cldev->cl, NULL); mei_me_cl_put(cldev->me_cl); mei_dev_bus_put(cldev->bus); + + list_for_each_entry(cl, &mdev->file_list, link) + WARN_ON(cl == cldev->cl); + kfree(cldev->cl); kfree(cldev); } -- 2.39.5