[ovs-dev] [PATCH 01/12] datapath: Fix an error handling path in 'ovs_nla_init_match_and_action()

[Yifeng Sun]

Looks good to me.


Reviewed-by: Yifeng Sun <pkusunyifeng at gmail.com>

On Mon, Dec 11, 2017 at 1:50 PM, Greg Rose <gvrose8192 at gmail.com> wrote:

> From: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
>
> Upstream commit:
> commit 5829e62ac17a40ab08c1b905565604a4b5fa7af6
> Author: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
> Date:   Mon Sep 11 21:56:20 2017 +0200
>
>     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 at wanadoo.fr>
>     Acked-by: Pravin B Shelar <pshelar at ovn.org>
>     Signed-off-by: David S. Miller <davem at davemloft.net>
>
> Cc: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
> Fixes: 850c2a4d1a ("datapath: Avoid using stack larger than 1024.")
> Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
> ---
>  datapath/datapath.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/datapath/datapath.c b/datapath/datapath.c
> index 1780819..eeab72a 100644
> --- a/datapath/datapath.c
> +++ b/datapath/datapath.c
> @@ -1136,7 +1136,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,
> --
> 1.8.3.1
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>