diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2024-01-02 07:27:45 +0100 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2024-01-27 09:13:59 +0100 |
| commit | ffc15626c861f811f9778914be004fcf43810a91 (patch) | |
| tree | 6652cbf166a402500d9673c61e05aca0a0c1eb27 /net/batman-adv | |
| parent | df3fc228dead6298ac9e985a270b8521e41471e6 (diff) | |
| download | linux-ffc15626c861f811f9778914be004fcf43810a91.tar.gz | |
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>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/distributed-arp-table.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 28a939d5609068..4c7e855343245b 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -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; } |