From da14c7fd9317036e6111c997ae672e69b0110c92 Mon Sep 17 00:00:00 2001
From: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Date: Wed, 10 Oct 2012 01:15:01 +0000
Subject: [PATCH] --- yaml --- r: 334014 b: refs/heads/master c:
 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netfilter.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c29471fb57ee..530e7a438c5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 435f08a721919a0027ff4f39f0b51c141c0e2c29
+refs/heads/master: 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index 68e8f364bbf8..fe43bc7b063f 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/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);