summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorSarveshwar Bandi2012-10-10 03:15:01 +0200
committerDavid S. Miller2012-10-11 04:50:45 +0200
commit6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 (patch)
treea46d917a1365ab6e2e2367c48f015bee45b20b5b /net/bridge
parentisdn: fix a wrapping bug in isdn_ppp_ioctl() (diff)
downloadkernel-qcow2-linux-6caab7b0544e83e6c160b5e80f5a4a7dd69545c7.tar.gz
kernel-qcow2-linux-6caab7b0544e83e6c160b5e80f5a4a7dd69545c7.tar.xz
kernel-qcow2-linux-6caab7b0544e83e6c160b5e80f5a4a7dd69545c7.zip
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>
Diffstat (limited to 'net/bridge')
-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 68e8f364bbf8..fe43bc7b063f 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);