lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 040/116] mac80211: don't check netdev state for debugfs read/write
    Date
    3.8.13.27 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arik Nemtsov <arik@wizery.com>

    commit 923eaf367206e01f22c97aee22300e332d071916 upstream.

    Doing so will lead to an oops for a p2p-dev interface, since it has
    no netdev.

    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>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/mac80211/debugfs_netdev.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
    index cbde5cc..8736537 100644
    --- a/net/mac80211/debugfs_netdev.c
    +++ b/net/mac80211/debugfs_netdev.c
    @@ -34,8 +34,7 @@ static ssize_t ieee80211_if_read(
    ssize_t ret = -EINVAL;

    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);

    if (ret >= 0)
    @@ -62,8 +61,7 @@ static ssize_t ieee80211_if_write(

    ret = -ENODEV;
    rtnl_lock();
    - if (sdata->dev->reg_state == NETREG_REGISTERED)
    - ret = (*write)(sdata, buf, count);
    + ret = (*write)(sdata, buf, count);
    rtnl_unlock();

    return ret;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-23 05:21    [W:4.069 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site