From: Jesse Gross <jesse@nicira.com>
Date: Fri, 4 Mar 2011 20:56:25 +0000 (-0800)
Subject: tunneling: Don't leak dst on vlan tagging failure.
X-Git-Tag: v1.1.0~186
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0cf59c05593ecb078fb3a284ea39f473e0b13364;p=sliver-openvswitch.git

tunneling: Don't leak dst on vlan tagging failure.

When we need to send a packet through the IP stack we need to attach
a dst to the skb.  Due to some interactions with caching this doesn't
happen until late in the transmission process.  However, if we are
inserting a vlan tag and the insertion fails it is possible to leak
the dst.

Reported-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index 7e0c8ee8c..98af30389 100644
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -1314,9 +1314,9 @@ next:
 error_free:
 	tnl_free_linked_skbs(skb);
 error:
-	dst_release(unattached_dst);
 	vport_record_error(vport, err);
 out:
+	dst_release(unattached_dst);
 	return sent_len;
 }