aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSarveshwar Bandi2012-10-09 20:15:01 -0500
committerGreg Kroah-Hartman2013-02-14 12:47:37 -0600
commit98df2584aaa730220adc29a7fbfa1c551fee5930 (patch)
treed92888383102ec6d850f6d1863a4e59f454e9c67 /net
parent9f557574821b44a87d95756bf53f1b7fb76eb4d4 (diff)
downloadkernel-common-98df2584aaa730220adc29a7fbfa1c551fee5930.tar.gz
kernel-common-98df2584aaa730220adc29a7fbfa1c551fee5930.tar.xz
kernel-common-98df2584aaa730220adc29a7fbfa1c551fee5930.zip
bridge: Pull ip header into skb->data before looking into ip header.
[ Upstream commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_netfilter.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 3dc7f5446a9..c3d0729f971 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -233,6 +233,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
233 struct net_device *dev = skb->dev; 233 struct net_device *dev = skb->dev;
234 u32 len; 234 u32 len;
235 235
236 if (!pskb_may_pull(skb, sizeof(struct iphdr)))
237 goto inhdr_error;
238
236 iph = ip_hdr(skb); 239 iph = ip_hdr(skb);
237 opt = &(IPCB(skb)->opt); 240 opt = &(IPCB(skb)->opt);
238 241