---

yaml --- r: 200891 b: refs/heads/master c: 1776206 h: refs/heads/master i: 200889: 85908f1 200887: ad7c2b7 v: v3
git-mirror · Jul 7, 2010 · dd99a7e · dd99a7e
1 parent 6a6ed85
commit dd99a7e
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: 7f285fa78d4b81b8458f05e77fb6b46245121b4e
+refs/heads/master: 17762060c25590bfddd68cc1131f28ec720f405f
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
@@ -591,6 +591,9 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff *skb,
 
 	pskb_trim_rcsum(skb, len);
 
+	/* BUG: Should really parse the IP options here. */
+	memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+
 	nf_bridge_put(skb->nf_bridge);
 	if (!nf_bridge_alloc(skb))
 		return NF_DROP;