lkml.org 
[lkml]   [2016]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 20/67] mac80211: fix statistics leak if dev_alloc_name() fails
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johannes Berg <johannes.berg@intel.com>

    commit e6436be21e77e3659b4ff7e357ab5a8342d132d2 upstream.

    In the case that dev_alloc_name() fails, e.g. because the name was
    given by the user and already exists, we need to clean up properly
    and free the per-CPU statistics. Fix that.

    Fixes: 5a490510ba5f ("mac80211: use per-CPU TX/RX statistics")
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/iface.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/mac80211/iface.c
    +++ b/net/mac80211/iface.c
    @@ -1750,7 +1750,7 @@ int ieee80211_if_add(struct ieee80211_lo

    ret = dev_alloc_name(ndev, ndev->name);
    if (ret < 0) {
    - free_netdev(ndev);
    + ieee80211_if_free(ndev);
    return ret;
    }

    @@ -1836,7 +1836,7 @@ int ieee80211_if_add(struct ieee80211_lo

    ret = register_netdevice(ndev);
    if (ret) {
    - free_netdev(ndev);
    + ieee80211_if_free(ndev);
    return ret;
    }
    }

    \
     
     \ /
      Last update: 2016-05-09 10:21    [W:4.912 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site