37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 3b24193d7cfc18f0cc005811ca4aab3479c2f1c6 Mon Sep 17 00:00:00 2001
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Thu, 24 Jan 2013 18:18:26 +0100
|
|
Subject: [PATCH 2/3] 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 0.0.0.0 source is used for duplicate address detection and thus seen
|
|
quite often.
|
|
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Acked-by: Antonio Quartulli <ordex@autistici.org>
|
|
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
|
|
---
|
|
distributed-arp-table.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/distributed-arp-table.c b/distributed-arp-table.c
|
|
index 9f4cff3..be3be28 100644
|
|
--- a/distributed-arp-table.c
|
|
+++ b/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);
|
|
--
|
|
1.7.10.4
|
|
|