commit ab64f16ff2e83371927c57a0380fd3c0fee5c1c1
author Pravin B Shelar <pshelar@nicira.com> Tue Nov 11 13:40:49 2014 -0800
committer Pravin B Shelar <pshelar@nicira.com> Fri Nov 14 15:13:26 2014 -0800
tree 0fc4278aa8fe57325a1e6ccda16efa76182f3fcd
parent b23dc5a7cc6ebc9a0d57351da7a0e8454c9ffea3

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>

net/openvswitch/actions.c

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