bridge: Reset IPCB on forward non-local packets in br_handle_frame_finish()

PATCH New Vasily Averin 1 participant 1 message Nov 2, 2011

Subsystems (3)

Networking Network drivers Ethernet bridge

lore

Share & tools

lore

Vasily Averin

author

2011-11-02 19:37 UTC #0 lore raw

PATCH v2 1/1 bridge: Reset IPCB on forward non-local packets in br_handle_frame_finish()

v2: extra bracket was removed

if dst is not local br_handle_frame_finish() does not clone original skb and forgets to reset IPCB before return to IP stack. it can lead to stack corruption in icmp_send()

Signed-off-by Vasily Averin <[email protected]>

---
 net/bridge/br_input.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

net/bridge/br_input.c +3 -2

index f06ee39..6be8d00 100644
@@ -93,10 +93,11 @@ int br_handle_frame_finish(struct sk_buff *skb)
 			skb2 = skb;
 
 		br->dev->stats.multicast++;
-	} else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
+	} else if ((dst = __br_fdb_get(br, dest)) != NULL) {
 		skb2 = skb;
 		/* Do not forward the packet since it's local. */
-		skb = NULL;
+		if (dst->is_local)
+			skb = NULL;
 	}
 
 	if (skb) {

-- 1.7.5.4