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

batman at open-mesh.org batman at open-mesh.org
Sat Nov 12 00:15:45 CET 2016


The following commit has been merged in the master branch:
commit 92eef520d77d106d9ea06b17294c5079edefe95d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Aug 6 17:04:22 2016 +0200

    batman-adv: Disallow zero and mcast src address for mgmt frames
    
    The routing check for management frames is validating the source mac
    address in the outer ethernet header. It rejects every source mac address
    which is a broadcast address. But it also has to reject the zero-mac
    address and multicast mac addresses.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index c02897b..4f034df 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -196,8 +196,8 @@ bool batadv_check_management_packet(struct sk_buff *skb,
 	if (!is_broadcast_ether_addr(ethhdr->h_dest))
 		return false;
 
-	/* packet with broadcast sender address */
-	if (is_broadcast_ether_addr(ethhdr->h_source))
+	/* packet with invalid sender address */
+	if (!is_valid_ether_addr(ethhdr->h_source))
 		return false;
 
 	/* create a copy of the skb, if needed, to modify it. */

-- 
LinuxNextTracking


More information about the linux-merge mailing list