summaryrefslogtreecommitdiff
path: root/net/batman-adv
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-03-24 01:53:50 +0300
committerSimon Wunderlich <sw@simonwunderlich.de>2018-04-22 10:29:01 +0300
commit65cc02a8e1d4449daedf3a84e9dfdda2e44a5d97 (patch)
tree9daba2d821512ed4ee30bdd02986434383a639a0 /net/batman-adv
parent60cc43fc888428bb2f18f08997432d426a243338 (diff)
downloadlinux-65cc02a8e1d4449daedf3a84e9dfdda2e44a5d97.tar.xz
batman-adv: don't pass a NULL hard_iface to batadv_hardif_put
In the case where hard_iface is NULL, the error path may pass a null pointer to batadv_hardif_put causing a null pointer dereference error. Avoid this by only calling the function if hard_iface not null. Detected by CoverityScan, CID#1466456 ("Explicit null dereferenced") Fixes: 53dd9a68ba68 ("batman-adv: add multicast flags netlink support") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-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/multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index a11d3d89f012..a35f597e8c8b 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -1536,7 +1536,7 @@ out:
if (!ret && primary_if)
*primary_if = hard_iface;
- else
+ else if (hard_iface)
batadv_hardif_put(hard_iface);
return ret;