Repository : ssh://git@open-mesh.org/batman-adv

On branches: maint,master

commit c7380677d6167f3798d3ea7a4f1a93663f3c7915 Author: Sven Eckelmann sven.eckelmann@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: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic") Signed-off-by: Sven Eckelmann sven.eckelmann@openmesh.com Acked-by: Antonio Quartulli a@unstable.cc

c7380677d6167f3798d3ea7a4f1a93663f3c7915 net/batman-adv/bat_v.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 4e2724c5..a6dcc823 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -815,7 +815,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)