diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-29 06:09:42 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-29 06:09:42 +0900 |
| commit | 6da287ad0266cca1fa8f88fb8b1c466e8164671f (patch) | |
| tree | cfdf86c200bf9f1199c45acf51644fc185c705ec /net/openvswitch/actions.c | |
| parent | ccaba4527156da1619a23bafcb944e8e029d0573 (diff) | |
| parent | 6887d9e5682886b5d9fe81217ff2f1410724cdb9 (diff) | |
Merge branch 'v3.17-next/power-exynos' into v3.17-next/dt-samsung-2
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index c36856a457ca..e70d8b18e962 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -551,6 +551,8 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, case OVS_ACTION_ATTR_SAMPLE: err = sample(dp, skb, a); + if (unlikely(err)) /* skb already freed. */ + return err; break; } |