leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: don't check netdev state for debugfs read/write

Browse Source 
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>
This commit is contained in:
Arik Nemtsov 2014-05-26 14:40:51 +03:00 committed by Johannes Berg
parent 494b659004
commit 923eaf3672
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/debugfs_netdev.c
View File

@ -34,8 +34,7 @@ static ssize_t ieee80211_if_read(
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
read_lock(&dev_base_lock); read_lock(&dev_base_lock);
if (sdata->dev->reg_state == NETREG_REGISTERED) ret = (*format)(sdata, buf, sizeof(buf));
ret = (*format)(sdata, buf, sizeof(buf));
read_unlock(&dev_base_lock); read_unlock(&dev_base_lock);
if (ret >= 0) if (ret >= 0)
@ -62,8 +61,7 @@ static ssize_t ieee80211_if_write(
ret = -ENODEV; ret = -ENODEV;
rtnl_lock(); rtnl_lock();
if (sdata->dev->reg_state == NETREG_REGISTERED) ret = (*write)(sdata, buf, count);
ret = (*write)(sdata, buf, count);
rtnl_unlock(); rtnl_unlock();
return ret; return ret;