Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit 7dfe729b169b1217f47744edbd1616f473340fda Author: Matthias Schiffer mschiffer@universe-factory.net Date: Fri Mar 16 11:29:10 2018 +0100

batman-adv: fix header size check in batadv_dbg_arp()

Checking for 0 is insufficient: when an SKB without a batadv header, but with a VLAN header is received, hdr_size will be 4, making the following code interpret the Ethernet header as a batadv header.

Fixes: 3e26722bc9f2 ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Matthias Schiffer mschiffer@universe-factory.net Signed-off-by: Sven Eckelmann sven@narfation.org

7dfe729b169b1217f47744edbd1616f473340fda net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 19b15de..b7ca4a3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -393,7 +393,7 @@ static void batadv_dbg_arp(struct batadv_priv *bat_priv, struct sk_buff *skb, batadv_arp_hw_src(skb, hdr_size), &ip_src, batadv_arp_hw_dst(skb, hdr_size), &ip_dst);

- if (hdr_size == 0) + if (hdr_size < sizeof(struct batadv_unicast_packet)) return;

unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data;