2020-12-04 11:42:46

by Wang Hai

Subject: [PATCH net] openvswitch: fix error return code in validate_and_copy_dec_ttl()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Changing 'return start' to 'return action_start' can fix this bug.

Fixes: 69929d4c49e1 ("net: openvswitch: fix TTL decrement action netlink message format")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wang Hai <[email protected]>
---
net/openvswitch/flow_netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index ec0689ddc635..4c5c2331e764 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -2531,7 +2531,7 @@ static int validate_and_copy_dec_ttl(struct net *net,

action_start = add_nested_action_start(sfa, OVS_DEC_TTL_ATTR_ACTION, log);
if (action_start < 0)
- return start;
+ return action_start;

err = __ovs_nla_copy_actions(net, actions, key, sfa, eth_type,
vlan_tci, mpls_label_count, log);
--
2.17.1

2020-12-04 12:13:48

by Eelco Chaudron

Subject: Re: [PATCH net] openvswitch: fix error return code in validate_and_copy_dec_ttl()

On 4 Dec 2020, at 12:43, Wang Hai wrote:

> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Changing 'return start' to 'return action_start' can fix this bug.
>
> Fixes: 69929d4c49e1 ("net: openvswitch: fix TTL decrement action
> netlink message format")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wang Hai <[email protected]>

Thanks for fixing!

Reviewed-by: Eelco Chaudron <[email protected]>

> ---
> net/openvswitch/flow_netlink.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/openvswitch/flow_netlink.c
> b/net/openvswitch/flow_netlink.c
> index ec0689ddc635..4c5c2331e764 100644
> --- a/net/openvswitch/flow_netlink.c
> +++ b/net/openvswitch/flow_netlink.c
> @@ -2531,7 +2531,7 @@ static int validate_and_copy_dec_ttl(struct net
> *net,
>
> action_start = add_nested_action_start(sfa, OVS_DEC_TTL_ATTR_ACTION,
> log);
> if (action_start < 0)
> - return start;
> + return action_start;
>
> err = __ovs_nla_copy_actions(net, actions, key, sfa, eth_type,
> vlan_tci, mpls_label_count, log);
> --
> 2.17.1

2020-12-04 23:49:45

by Jakub Kicinski

Subject: Re: [PATCH net] openvswitch: fix error return code in validate_and_copy_dec_ttl()

On Fri, 04 Dec 2020 13:07:48 +0100 Eelco Chaudron wrote:
> > Fix to return a negative error code from the error handling
> > case instead of 0, as done elsewhere in this function.
> >
> > Changing 'return start' to 'return action_start' can fix this bug.
> >
> > Fixes: 69929d4c49e1 ("net: openvswitch: fix TTL decrement action
> > netlink message format")
> > Reported-by: Hulk Robot <[email protected]>
> > Signed-off-by: Wang Hai <[email protected]>
>
> Thanks for fixing!
>
> Reviewed-by: Eelco Chaudron <[email protected]>

Applied, thanks!