diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 19:07:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 19:07:25 +0200 |
| commit | 90125edbc49ec58b9101c4271bb1d87b04a4620f (patch) | |
| tree | 068353d4234435b17ade687b50a5d5015bdf1ad9 /net/openvswitch/actions.c | |
| parent | test: add firmware_class loader test (diff) | |
| parent | Linux 3.16-rc6 (diff) | |
| download | linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.xz linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.zip | |
Merge 3.16-rc6 into driver-core-next
We want the platform changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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; } |