---

yaml --- r: 334014 b: refs/heads/master c: 6caab7b h: refs/heads/master v: v3
git-mirror · Oct 11, 2012 · da14c7f · da14c7f
1 parent a42badb
commit da14c7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);