FAILED: patch "[PATCH] mei: bus: access mei_device under device_lock on cleanup" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x f112ea910e554d58b4b39a4492b7d302f0f4204f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072943-hamlet-onion-0655@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f112ea910e554d58b4b39a4492b7d302f0f4204f Mon Sep 17 00:00:00 2001
From: Alexander Usyskin <[email protected]>
Date: Sun, 5 Jul 2026 18:12:59 +0300
Subject: [PATCH] mei: bus: access mei_device under device_lock on cleanup
Fix couple of problems in mei_cl_bus_dev_release():
mei_cl_flush_queues() is running without lock. bus->file_list access after mei_dev_bus_put(bus) can become a use-after-free if this was the last reference to bus.
Protect queues cleanup and WARN traversal by device lock there to avoid the concurrent access problems.
Move WARN traversal before mei_dev_bus_put(bus).
This file uses bus variable name for mei_device, adjust code of mei_cl_bus_dev_release() to use bus variable too.
drivers/misc/mei/bus.c +9 -7
@@ -4,6 +4,7 @@* Intel Management Engine Interface (Intel MEI) Linux driver */ +#include <linux/cleanup.h> #include <linux/module.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -1330,15 +1331,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_device *bus = cldev->bus;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); + scoped_guard(mutex, &bus->device_lock) { +mei_cl_flush_queues (cldev->cl,NULL ); +mei_me_cl_put (cldev->me_cl); +list_for_each_entry (cl, &bus->file_list, link) +WARN_ON (cl == cldev->cl); + } +mei_dev_bus_put (bus);kfree (cldev->cl);kfree (cldev);
Sasha Levin
maintainerPATCH 1/1 mei: bus: access mei_device under device_lock on cleanup
From: Alexander Usyskin <[email protected]>
[ Upstream commit f112ea910e554d58b4b39a4492b7d302f0f4204f ]
Fix couple of problems in mei_cl_bus_dev_release():
mei_cl_flush_queues() is running without lock. bus->file_list access after mei_dev_bus_put(bus) can become a use-after-free if this was the last reference to bus.
Protect queues cleanup and WARN traversal by device lock there to avoid the concurrent access problems.
Move WARN traversal before mei_dev_bus_put(bus).
This file uses bus variable name for mei_device, adjust code of mei_cl_bus_dev_release() to use bus variable too.
--- drivers/misc/mei/bus.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/misc/mei/bus.c +9 -7
@@ -4,6 +4,7 @@* Intel Management Engine Interface (Intel MEI) Linux driver */ +#include <linux/cleanup.h> #include <linux/module.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -1113,18 +1114,19 @@ 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_device *bus = cldev->bus;struct mei_cl *cl;if (!cldev)return ; -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); + scoped_guard(mutex, &bus->device_lock) { +mei_cl_flush_queues (cldev->cl,NULL ); +mei_me_cl_put (cldev->me_cl); +list_for_each_entry (cl, &bus->file_list, link) +WARN_ON (cl == cldev->cl); + } +mei_dev_bus_put (bus);kfree (cldev->cl);kfree (cldev);
Signature · 1 line
2.53.0