summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2014-11-11 13:40:49 -0800
committerPravin B Shelar <pshelar@nicira.com>2014-11-14 15:13:26 -0800
commitab64f16ff2e83371927c57a0380fd3c0fee5c1c1 (patch)
tree0fc4278aa8fe57325a1e6ccda16efa76182f3fcd /net/openvswitch
parentb23dc5a7cc6ebc9a0d57351da7a0e8454c9ffea3 (diff)
downloadtalos-obmc-linux-ab64f16ff2e83371927c57a0380fd3c0fee5c1c1.tar.gz
talos-obmc-linux-ab64f16ff2e83371927c57a0380fd3c0fee5c1c1.zip
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>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/actions.c2
1 files changed, 0 insertions, 2 deletions
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;
}
OpenPOWER on IntegriCloud