From: Pravin B Shelar <pshelar@nicira.com>
Date: Tue, 11 Nov 2014 21:40:49 +0000 (-0800)
Subject: openvswitch: Fix memory leak.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab64f16ff2e83371927c57a0380fd3c0fee5c1c1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

openvswitch: Fix memory leak.

Need to free memory in case of sample action error.

Introduced by commit 651887b0c22cffcfce7eb9c ("openvswitch: Sample
action without side effects").

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 006886dbee36..00e447a17f64 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -722,8 +722,6 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 
 		case OVS_ACTION_ATTR_SAMPLE:
 			err = sample(dp, skb, key, a);
-			if (unlikely(err)) /* skb already freed. */
-				return err;
 			break;
 		}