From: Sven Eckelmann Date: Tue, 10 May 2011 09:22:37 +0000 (+0200) Subject: batman-adv: Ensure that we really have route changes in update_route X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bb899b89f46eb1fd6f62a4c360f6511b9714e479;p=deliverable%2Flinux.git batman-adv: Ensure that we really have route changes in update_route The debug output of update_route has tests for "route deleted" and "route added". All other situations are handled as "route changed". This is not true because neigh_node and curr_router could be both NULL. The function is not called in this situation, but the code might be interpreted wrong when reading it without this test. Signed-off-by: Sven Eckelmann --- diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 90ae6f0c30f3..368ceeba8145 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -108,7 +108,7 @@ static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, tt_buff, tt_buff_len); /* route changed */ - } else { + } else if (neigh_node && curr_router) { bat_dbg(DBG_ROUTES, bat_priv, "Changing route towards: %pM " "(now via %pM - was via %pM)\n",