Re: [PATCH net] ipv4: fix error return code in rtm_to_fib_config()

[Jakub Kicinski]

On Fri, 4 Dec 2020 09:04:08 -0700 David Ahern wrote:
> On 12/4/20 1:48 AM, Zhang Changzhong wrote:
> > Fix to return a negative error code from the error handling
> > case instead of 0, as done elsewhere in this function.
> > 
> > Fixes: d15662682db2 ("ipv4: Allow ipv6 gateway with ipv4 routes")
> > Reported-by: Hulk Robot 
> > Signed-off-by: Zhang Changzhong 
> 
> Reviewed-by: David Ahern 

Applied, thanks!

Re: [PATCH net] ipv4: fix error return code in rtm_to_fib_config()

[David Ahern]

On 12/4/20 1:48 AM, Zhang Changzhong wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Fixes: d15662682db2 ("ipv4: Allow ipv6 gateway with ipv4 routes")
> Reported-by: Hulk Robot 
> Signed-off-by: Zhang Changzhong 
> ---
>  net/ipv4/fib_frontend.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
> index b87140a..cdf6ec5 100644
> --- a/net/ipv4/fib_frontend.c
> +++ b/net/ipv4/fib_frontend.c
> @@ -825,7 +825,7 @@ static int rtm_to_fib_config(struct net *net, struct 
> sk_buff *skb,
>   if (has_gw && has_via) {
>   NL_SET_ERR_MSG(extack,
>  "Nexthop configuration can not contain both 
> GATEWAY and VIA");
> - goto errout;
> + return -EINVAL;
>   }
>  
>   return 0;
> 

Thanks for the patch.

Reviewed-by: David Ahern 

[PATCH net] ipv4: fix error return code in rtm_to_fib_config()

[Zhang Changzhong]

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

Fixes: d15662682db2 ("ipv4: Allow ipv6 gateway with ipv4 routes")
Reported-by: Hulk Robot 
Signed-off-by: Zhang Changzhong 
---
 net/ipv4/fib_frontend.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index b87140a..cdf6ec5 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -825,7 +825,7 @@ static int rtm_to_fib_config(struct net *net, struct 
sk_buff *skb,
if (has_gw && has_via) {
NL_SET_ERR_MSG(extack,
   "Nexthop configuration can not contain both 
GATEWAY and VIA");
-   goto errout;
+   return -EINVAL;
}
 
return 0;
-- 
2.9.5