diff mbox series

batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible

Message ID 20171129095042.12587-1-sven.eckelmann@openmesh.com
State Accepted, archived
Commit c7380677d6167f3798d3ea7a4f1a93663f3c7915
Delegated to: Sven Eckelmann
Headers show
Series batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible | expand

Commit Message

Sven Eckelmann Nov. 29, 2017, 9:50 a.m. UTC
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>
---
Cc: Antonio Quartulli <a@unstable.cc>
---
 net/batman-adv/bat_v.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Antonio Quartulli Nov. 29, 2017, 10:36 a.m. UTC | #1
On 29/11/17 17:50, Sven Eckelmann wrote:
> 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>
Sven Eckelmann Dec. 1, 2017, 11:32 a.m. UTC | #2
On Mittwoch, 29. November 2017 10:50:42 CET Sven Eckelmann wrote:
> 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>
> ---
> Cc: Antonio Quartulli <a@unstable.cc>
> ---
>  net/batman-adv/bat_v.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied in c7380677d616 [1]

Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/c7380677d6167f3798d3ea7a4f1a93663f3c7915
diff mbox series

Patch

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 341ceab8338d829d14a48831bef805bb04af0a8f..e0e2bfcd6b3efd73f2567d23ce304951c9e2c3f0 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)