From: Sven Eckelmann Date: Fri, 26 Feb 2016 16:56:13 +0000 (+0100) Subject: batman-adv: Check skb size before using encapsulated ETH+VLAN header X-Git-Tag: v4.1.12-92~15^2~66 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=daad4703b9ea0813adf59711d8ac9fc223ab324d;p=users%2Fjedix%2Flinux-maple.git batman-adv: Check skb size before using encapsulated ETH+VLAN header Orabug: 25308072 [ Upstream commit c78296665c3d81f040117432ab9e1cb125521b0c ] The encapsulated ethernet and VLAN header may be outside the received ethernet frame. Thus the skb buffer size has to be checked before it can be parsed to find out if it encapsulates another batman-adv packet. Fixes: 420193573f11 ("batman-adv: softif bridge loop avoidance") Signed-off-by: Sven Eckelmann Signed-off-by: Marek Lindner Signed-off-by: Antonio Quartulli Signed-off-by: Sasha Levin (cherry picked from commit f7ac631102975609851be1969f7d89a77ecaa52e) Signed-off-by: Dhaval Giani --- diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index a0b1b861b968e..b38a8aa3cce88 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -377,11 +377,17 @@ void batadv_interface_rx(struct net_device *soft_iface, */ nf_reset(skb); + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: + if (!pskb_may_pull(skb, VLAN_ETH_HLEN)) + goto dropped; + vhdr = (struct vlan_ethhdr *)skb->data; if (vhdr->h_vlan_encapsulated_proto != ethertype) @@ -393,8 +399,6 @@ void batadv_interface_rx(struct net_device *soft_iface, } /* skb->dev & skb->pkt_type are set here */ - if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) - goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be necessary anymore as we use skb_pull_rcsum()