diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-13 21:27:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-13 11:51:06 +0300 |
| commit | 5781b53dd89c1034daa0929fe98f87f87d1af914 (patch) | |
| tree | 6f3e6a5c3f884ca06991581aeb169abbb1f26aee | |
| parent | b57b3b00828467b922838731827385174ae9a9c9 (diff) | |
| download | linux-5781b53dd89c1034daa0929fe98f87f87d1af914.tar.xz | |
driver core: Add missing dev->bus->need_parent_lock checks
commit e121a833745b4708b660e3fe6776129c2956b041 upstream.
__device_release_driver() has to check dev->bus->need_parent_lock
before dropping the parent lock and acquiring it again as it may
attempt to drop a lock that hasn't been acquired or lock a device
that shouldn't be locked and create a lock imbalance.
Fixes: 8c97a46af04b (driver core: hold dev's parent lock when needed)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/base/dd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index edfc9f0b1180..2607f859881a 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -931,11 +931,11 @@ static void __device_release_driver(struct device *dev, struct device *parent) while (device_links_busy(dev)) { device_unlock(dev); - if (parent) + if (parent && dev->bus->need_parent_lock) device_unlock(parent); device_links_unbind_consumers(dev); - if (parent) + if (parent && dev->bus->need_parent_lock) device_lock(parent); device_lock(dev); |