bridge: Clear INET control block of SKBs passed into ip_fragment().

davem330 · davem330 · commit 87f94b4e91dc · 2010-09-01T19:17:34.000-07:00
In a similar vain to commit 1776206 ("bridge: Clear IPCB before possible entry into IP stack") Any time we call into the IP stack we have to make sure the state there is as expected by the ipv4 code. With help from Eric Dumazet and Herbert Xu. Reported-by: Bandan Das <bandan.das@stratus.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
@@ -761,9 +761,11 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)
 {
 	if (skb->nfct != NULL && skb->protocol == htons(ETH_P_IP) &&
 	    skb->len + nf_bridge_mtu_reduction(skb) > skb->dev->mtu &&
-	    !skb_is_gso(skb))
+	    !skb_is_gso(skb)) {
+		/* BUG: Should really parse the IP options here. */
+		memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
 		return ip_fragment(skb, br_dev_queue_push_xmit);
-	else
+	} else
 		return br_dev_queue_push_xmit(skb);
 }
 #else

Original file line number	Diff line number	Diff line change
`@@ -761,9 +761,11 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)`
`761`	`761`	`{`
`762`	`762`	`if (skb->nfct != NULL && skb->protocol == htons(ETH_P_IP) &&`
`763`	`763`	`skb->len + nf_bridge_mtu_reduction(skb) > skb->dev->mtu &&`
`764`		`- !skb_is_gso(skb))`
	`764`	`+ !skb_is_gso(skb)) {`
	`765`	`+ /* BUG: Should really parse the IP options here. */`
	`766`	`+ memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));`
`765`	`767`	`return ip_fragment(skb, br_dev_queue_push_xmit);`
`766`		`- else`
	`768`	`+ } else`
`767`	`769`	`return br_dev_queue_push_xmit(skb);`
`768`	`770`	`}`
`769`	`771`	`#else`