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

batman at open-mesh.org batman at open-mesh.org
Tue Dec 19 00:16:37 CET 2017


The following commit has been merged in the master branch:
commit 198a62ddffa4a4ffaeb741f642b7b52f2d91ae9b
Author: Sven Eckelmann <sven.eckelmann at openmesh.com>
Date:   Wed Nov 29 10:50:42 2017 +0100

    batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
    
    The batadv_v_gw_is_eligible function already assumes that orig_node is not
    NULL. But batadv_gw_node_get may have failed to find the originator. It
    must therefore be checked whether the batadv_gw_node_get failed and not
    whether orig_node is NULL to detect this error.
    
    Fixes: 50164d8f500f ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic")
    Signed-off-by: Sven Eckelmann <sven.eckelmann at openmesh.com>
    Acked-by: Antonio Quartulli <a at unstable.cc>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 341ceab8338d..e0e2bfcd6b3e 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -814,7 +814,7 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv,
 	}
 
 	orig_gw = batadv_gw_node_get(bat_priv, orig_node);
-	if (!orig_node)
+	if (!orig_gw)
 		goto out;
 
 	if (batadv_v_gw_throughput_get(orig_gw, &orig_throughput) < 0)

-- 
LinuxNextTracking


More information about the linux-merge mailing list