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

Subsystems: ethernet bridge, netfilter, networking [general], the rest

STALE5108d

2 messages, 2 authors, 2012-10-11 · open the first message on its own page

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

From: <hidden>
Date: 2012-10-10 11:15:07

From: Sarveshwar Bandi <redacted>

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 <redacted>
---
 net/bridge/br_netfilter.c |    3 +++
 1 file changed, 3 insertions(+)
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 68e8f36..fe43bc7 100644
--- a/net/bridge/br_netfilter.c
+++ b/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;
 	u32 len;
 
+	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+		goto inhdr_error;
+
 	iph = ip_hdr(skb);
 	opt = &(IPCB(skb)->opt);
 
-- 
1.7.9.5

Re: [PATCH] bridge: Pull ip header into skb->data before looking into ip header.

From: David Miller <davem@davemloft.net>
Date: 2012-10-11 02:53:59

From: <redacted>
Date: Wed, 10 Oct 2012 16:45:01 +0530
From: Sarveshwar Bandi <redacted>

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 <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help