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

batman at open-mesh.org batman at open-mesh.org
Sun Feb 3 00:21:41 CET 2013

The following commit has been merged in the master branch:
commit 757dd82ea7008ddaccfecff3397bec3e3203a89e
Author: Matthias Schiffer <mschiffer at universe-factory.net>
Date:   Thu Jan 24 18:18:26 2013 +0100

    batman-adv: check for more types of invalid IP addresses in DAT
    There are more types of IP addresses that may appear in ARP packets that we
    don't want to process. While some of these should never appear in sane ARP
    packets, a source is used for duplicate address detection and thus seen
    quite often.
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index ce0d299..ccb3c6c 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -777,7 +777,9 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
 	ip_src = batadv_arp_ip_src(skb, hdr_size);
 	ip_dst = batadv_arp_ip_dst(skb, hdr_size);
 	if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) ||
-	    ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst))
+	    ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst) ||
+	    ipv4_is_zeronet(ip_src) || ipv4_is_lbcast(ip_src) ||
+	    ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst))
 		goto out;
 	type = ntohs(arphdr->ar_op);


More information about the linux-merge mailing list