diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2014-12-24 01:20:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-24 05:57:31 +0100 |
| commit | 997e068ebc17d8d57e735578df44b6341cd5f2f3 (patch) | |
| tree | 2fc6e7b30a84898baeb28fd3ec783e292541335c /net/openvswitch/vport-geneve.c | |
| parent | openvswitch: Fix GSO with multiple MPLS label. (diff) | |
| download | linux-997e068ebc17d8d57e735578df44b6341cd5f2f3.tar.xz linux-997e068ebc17d8d57e735578df44b6341cd5f2f3.zip | |
openvswitch: Fix vport_send double free
Today vport-send has complex error handling because it involves
freeing skb and updating stats depending on return value from
vport send implementation.
This can be simplified by delegating responsibility of freeing
skb to the vport implementation for all cases. So that
vport-send needs just update stats.
Fixes: 91b7514cdf ("openvswitch: Unify vport error stats
handling")
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-geneve.c')
| -rw-r--r-- | net/openvswitch/vport-geneve.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c index 347fa2325b22..484864dd0e68 100644 --- a/net/openvswitch/vport-geneve.c +++ b/net/openvswitch/vport-geneve.c @@ -219,7 +219,10 @@ static int geneve_tnl_send(struct vport *vport, struct sk_buff *skb) false); if (err < 0) ip_rt_put(rt); + return err; + error: + kfree_skb(skb); return err; } |