diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-07 19:39:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-07 19:39:34 -0700 |
| commit | edc1bb0bd7d409f62ed7ba462ca5313be95cbed3 (patch) | |
| tree | 1b3bd0ce4f3041365d31495fba900d1dccf9da55 /net/openvswitch/actions.c | |
| parent | 11ef7a8996d5d433c9cd75d80651297eccbf6d42 (diff) | |
| parent | 4a46b24e147dfa9b858026da02cad0bdd4e149d2 (diff) | |
Merge branch 'net_ovs_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch
Pravin B Shelar says:
====================
Open vSwitch
A set of fixes for net.
First bug is related flow-table management. Second one is in sample
action. Third is related flow stats and last one add gre-err handler for ovs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 c36856a457c..e70d8b18e96 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; } |