projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5befb2
)
mac80211: fix 'reset' debugfs locking
author
Johannes Berg
<johannes.berg@intel.com>
Tue, 8 Jun 2021 09:32:27 +0000
(11:32 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Wed, 9 Jun 2021 14:09:18 +0000
(16:09 +0200)
cfg80211 now calls suspend/resume with the wiphy lock
held, and while there's a problem with that needing
to be fixed, we should do the same in debugfs.
Cc: stable@vger.kernel.org
Fixes:
a05829a7222e
("cfg80211: avoid holding the RTNL when calling the driver")
Link:
https://lore.kernel.org/r/20210608113226.14020430e449.I78e19db0a55a8295a376e15ac4cf77dbb4c6fb51@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/debugfs.c
patch
|
blob
|
blame
|
history
diff --git
a/net/mac80211/debugfs.c
b/net/mac80211/debugfs.c
index 9245c0421bda728c872dcab04ee92facc978cbf6..b5ff61b6448ab9745f5aa9d6b741904e1c3d73a8 100644
(file)
--- a/
net/mac80211/debugfs.c
+++ b/
net/mac80211/debugfs.c
@@
-4,7
+4,7
@@
*
* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2013-2014 Intel Mobile Communications GmbH
- * Copyright (C) 2018 - 2019 Intel Corporation
+ * Copyright (C) 2018 - 2019
, 2021
Intel Corporation
*/
#include <linux/debugfs.h>
@@
-389,8
+389,10
@@
static ssize_t reset_write(struct file *file, const char __user *user_buf,
struct ieee80211_local *local = file->private_data;
rtnl_lock();
+ wiphy_lock(local->hw.wiphy);
__ieee80211_suspend(&local->hw, NULL);
__ieee80211_resume(&local->hw);
+ wiphy_unlock(local->hw.wiphy);
rtnl_unlock();
return count;