瀏覽代碼

bridge: Pull ip header into skb->data before looking into ip header.

If lower layer driver leaves the ip header in the skb fragment, it needs to
be first pulled into skb->data before inspecting ip header length or ip version
number.

Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sarveshwar Bandi 13 年之前
父節點
當前提交
6caab7b054
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      net/bridge/br_netfilter.c

+ 3 - 0
net/bridge/br_netfilter.c

@@ -265,6 +265,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
 	struct net_device *dev = skb->dev;
 	struct net_device *dev = skb->dev;
 	u32 len;
 	u32 len;
 
 
+	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+		goto inhdr_error;
+
 	iph = ip_hdr(skb);
 	iph = ip_hdr(skb);
 	opt = &(IPCB(skb)->opt);
 	opt = &(IPCB(skb)->opt);