forked from Minki/linux
Included changes ares:
- fix an skb memleak in DAT - fix the ARP filtering routine in DAT by preventing bogus entries to overwrite already existing ones in the local cache. - fix the ARP filtering routine in DAT by preventing it to parse and add to the cache bogus entries -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRBV1fAAoJEADl0hg6qKeOJnkQALIJCps/Lx5XE+JKTXYlHM/Z XJs6y5fOZQJiBaRDkp84+802ozcCIUBbZvvzA3GWFIVB63shD+kHrfIQoen8706p XqlV+Z8ut77RKfAK2+gjyGiYhGuWkuN+KRs3ezcgwQnuBqrPSO42aeK4Tnc7/btN kMptwcHH2I81WTKXAbMO1pw6O+0NYOFsI9HV7XAi2eLMNl18LK9D+Oj32MCjI/ZP 8ukKdSGkxF4LLi6giSPAHJyShTHAwgdC/MMPjHtemuyPKxINee8I8zF2rndJ1e5i xl9zaLrdhXFleCmXcrOv7lqVds5kyyZBcQG2ZyIdJl/M5NWkt6BLiILZM8Z7/VX7 tzkJntTHfIftD+Q9MmQsxV79THR7EGUqaxCgRAO3tQwkFFfQoUL8JhnvTS7aeQwq a8lWZH0q/n1aEC2El22D8H17KS+0Ai0osRITWwAAeoL8dx4h8Yc0FKJSVGOH4qrc mSAKxacE7JPOz/j/QkL8yBKj5xx7FBWZOcIs7gVgPuIIMTiQHpHZmztupaYiVZLM ZlavzcnO5NiEidsKzFxrRIj6PaQqq+wACNzELggWdF+ksr7lO3I1pqQTe17VDdeR +RYUI4+ij+94bkvp6uzoQFJH/opeCvgdG7pl+6DkY97pWg52H8eb4Ercaswao2ix q7mBawgcIJAtmzEAXsZp =DvXf -----END PGP SIGNATURE----- Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Included changes ares: - fix an skb memleak in DAT - fix the ARP filtering routine in DAT by preventing bogus entries to overwrite already existing ones in the local cache. - fix the ARP filtering routine in DAT by preventing it to parse and add to the cache bogus entries Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
2afd0a24da
@ -738,6 +738,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
|
||||
struct arphdr *arphdr;
|
||||
struct ethhdr *ethhdr;
|
||||
__be32 ip_src, ip_dst;
|
||||
uint8_t *hw_src, *hw_dst;
|
||||
uint16_t type = 0;
|
||||
|
||||
/* pull the ethernet header */
|
||||
@ -777,9 +778,23 @@ 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;
|
||||
|
||||
hw_src = batadv_arp_hw_src(skb, hdr_size);
|
||||
if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src))
|
||||
goto out;
|
||||
|
||||
/* we don't care about the destination MAC address in ARP requests */
|
||||
if (arphdr->ar_op != htons(ARPOP_REQUEST)) {
|
||||
hw_dst = batadv_arp_hw_dst(skb, hdr_size);
|
||||
if (is_zero_ether_addr(hw_dst) ||
|
||||
is_multicast_ether_addr(hw_dst))
|
||||
goto out;
|
||||
}
|
||||
|
||||
type = ntohs(arphdr->ar_op);
|
||||
out:
|
||||
return type;
|
||||
@ -1012,6 +1027,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
|
||||
*/
|
||||
ret = !batadv_is_my_client(bat_priv, hw_dst);
|
||||
out:
|
||||
if (ret)
|
||||
kfree_skb(skb);
|
||||
/* if ret == false -> packet has to be delivered to the interface */
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user