mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data()
The kfree() function was called in one case by the batadv_dat_forward_data() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus return directly after a batadv_dat_select_candidates() call failed at the beginning. * Delete the label “out” which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
parent
df3fc228de
commit
ffc15626c8
@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
|
||||
|
||||
cand = batadv_dat_select_candidates(bat_priv, ip, vid);
|
||||
if (!cand)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
|
||||
|
||||
@ -728,7 +728,6 @@ free_orig:
|
||||
batadv_orig_node_put(cand[i].orig_node);
|
||||
}
|
||||
|
||||
out:
|
||||
kfree(cand);
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user