[linux-next] LinuxNextTracking branch, master, updated. next-20180529

batman at open-mesh.org batman at open-mesh.org
Wed May 30 00:17:29 CEST 2018


The following commit has been merged in the master branch:
commit 65cc02a8e1d4449daedf3a84e9dfdda2e44a5d97
Author: Colin Ian King <colin.king at canonical.com>
Date:   Fri Mar 23 22:53:50 2018 +0000

    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 at canonical.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

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;

-- 
LinuxNextTracking


More information about the linux-merge mailing list