diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-09-11 21:56:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-13 05:37:31 +0200 |
| commit | 5829e62ac17a40ab08c1b905565604a4b5fa7af6 (patch) | |
| tree | 9dfd04bae0dc53805fe92daa95c24e37d3252513 /net | |
| parent | smsc95xx: Configure pause time to 0xffff when tx flow control enabled (diff) | |
| download | linux-5829e62ac17a40ab08c1b905565604a4b5fa7af6.tar.xz linux-5829e62ac17a40ab08c1b905565604a4b5fa7af6.zip | |
openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()'
All other error handling paths in this function go through the 'error'
label. This one should do the same.
Fixes: 9cc9a5cb176c ("datapath: Avoid using stack larger than 1024.")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 76cf273a56c7..c3aec6227c91 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1112,7 +1112,8 @@ static int ovs_nla_init_match_and_action(struct net *net, if (!a[OVS_FLOW_ATTR_KEY]) { OVS_NLERR(log, "Flow key attribute not present in set flow."); - return -EINVAL; + error = -EINVAL; + goto error; } *acts = get_flow_actions(net, a[OVS_FLOW_ATTR_ACTIONS], key, |