diff options
author | Arik Nemtsov <arik@wizery.com> | 2014-05-26 07:40:51 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-28 10:22:48 -0400 |
commit | 923eaf367206e01f22c97aee22300e332d071916 (patch) | |
tree | c34ce1d0bbf9b1b31a0a12d9c61a8edb9e962a4f /net/mac80211/debugfs_netdev.c | |
parent | 494b6590043b4cd73ceb3f58e1c012a2c6c98d85 (diff) |
mac80211: don't check netdev state for debugfs read/write
Doing so will lead to an oops for a p2p-dev interface, since it has
no netdev.
Cc: stable@vger.kernel.org
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/debugfs_netdev.c')
-rw-r--r-- | net/mac80211/debugfs_netdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 40a648938985..e205ebabfa50 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c | |||
@@ -34,8 +34,7 @@ static ssize_t ieee80211_if_read( | |||
34 | ssize_t ret = -EINVAL; | 34 | ssize_t ret = -EINVAL; |
35 | 35 | ||
36 | read_lock(&dev_base_lock); | 36 | read_lock(&dev_base_lock); |
37 | if (sdata->dev->reg_state == NETREG_REGISTERED) | 37 | ret = (*format)(sdata, buf, sizeof(buf)); |
38 | ret = (*format)(sdata, buf, sizeof(buf)); | ||
39 | read_unlock(&dev_base_lock); | 38 | read_unlock(&dev_base_lock); |
40 | 39 | ||
41 | if (ret >= 0) | 40 | if (ret >= 0) |
@@ -62,8 +61,7 @@ static ssize_t ieee80211_if_write( | |||
62 | 61 | ||
63 | ret = -ENODEV; | 62 | ret = -ENODEV; |
64 | rtnl_lock(); | 63 | rtnl_lock(); |
65 | if (sdata->dev->reg_state == NETREG_REGISTERED) | 64 | ret = (*write)(sdata, buf, count); |
66 | ret = (*write)(sdata, buf, count); | ||
67 | rtnl_unlock(); | 65 | rtnl_unlock(); |
68 | 66 | ||
69 | return ret; | 67 | return ret; |