Patch "openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()'" has been added to the 4.13-stable tree

Patch "openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()'" has been added to the 4.13-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()'

to the 4.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     openvswitch-fix-an-error-handling-path-in-ovs_nla_init_match_and_action.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Mon Oct  9 09:32:35 CEST 2017
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date: Mon, 11 Sep 2017 21:56:20 +0200
Subject: openvswitch: Fix an error handling path in 'ovs_nla_init_match_and_action()'

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>


[ Upstream commit 5829e62ac17a40ab08c1b905565604a4b5fa7af6 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/openvswitch/datapath.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1126,7 +1126,8 @@ static int ovs_nla_init_match_and_action
 		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,


Patches currently in stable-queue which might be from christophe.jaillet@wanadoo.fr are

queue-4.13/openvswitch-fix-an-error-handling-path-in-ovs_nla_init_match_and_action.patch