[linux-next] LinuxNextTracking branch, master, updated. next-20190329

batman at open-mesh.org batman at open-mesh.org
Sat Mar 30 00:19:31 CET 2019


The following commit has been merged in the master branch:
commit ca8c3b922e7032aff6cc3fd05548f4df1f3df90e
Author: Anders Roxell <anders.roxell at linaro.org>
Date:   Fri Feb 22 16:25:54 2019 +0100

    batman-adv: fix warning in function batadv_v_elp_get_throughput
    
    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 at linaro.org>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index a9b7919c9de5..d5df0114f08a 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) {

-- 
LinuxNextTracking


More information about the linux-merge mailing list