Commit bb2da765 authored by Wang Hai's avatar Wang Hai Committed by Jakub Kicinski
Browse files

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: 69929d4c ("net: openvswitch: fix TTL decrement action netlink message format")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Reviewed-by: default avatarEelco Chaudron <echaudro@redhat.com>
Link: https://lore.kernel.org/r/20201204114314.1596-1-wanghai38@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ee4f52a8

net/openvswitch/flow_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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);