lkml.org 
[lkml]   [2019]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 11/66] batman-adv: fix warning in function batadv_v_elp_get_throughput
    Date
    From: Anders Roxell <anders.roxell@linaro.org>

    [ Upstream commit ca8c3b922e7032aff6cc3fd05548f4df1f3df90e ]

    When CONFIG_CFG80211 isn't enabled the compiler correcly warns about
    'sinfo.pertid' may be unused. It can also happen for other error
    conditions that it not warn about.

    net/batman-adv/bat_v_elp.c: In function ‘batadv_v_elp_get_throughput.isra.0’:
    include/net/cfg80211.h:6370:13: warning: ‘sinfo.pertid’ may be used
    uninitialized in this function [-Wmaybe-uninitialized]
    kfree(sinfo->pertid);
    ~~~~~^~~~~~~~

    Rework so that we only release '&sinfo' if cfg80211_get_station returns
    zero.

    Fixes: 7d652669b61d ("batman-adv: release station info tidstats")
    Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
    Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
    ---
    net/batman-adv/bat_v_elp.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
    index ef0dec20c7d8..5da183b2f4c9 100644
    --- a/net/batman-adv/bat_v_elp.c
    +++ b/net/batman-adv/bat_v_elp.c
    @@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)

    ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo);

    - /* free the TID stats immediately */
    - cfg80211_sinfo_release_content(&sinfo);
    + if (!ret) {
    + /* free the TID stats immediately */
    + cfg80211_sinfo_release_content(&sinfo);
    + }

    dev_put(real_netdev);
    if (ret == -ENOENT) {
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-04-24 17:00    [W:5.876 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site