diff options
| author | Zhang Changzhong <zhangchangzhong@huawei.com> | 2020-12-04 16:48:14 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-21 13:27:03 +0100 |
| commit | 1fe6b822b335d3781ad466a7bbc3898abcd8d63e (patch) | |
| tree | 0eff91d49dd76a67cf4f335569638146d6bc05fb | |
| parent | 8b4f08f280154147b20437d14644804223bfbdcb (diff) | |
| download | linux-stable-1fe6b822b335d3781ad466a7bbc3898abcd8d63e.tar.gz linux-stable-1fe6b822b335d3781ad466a7bbc3898abcd8d63e.tar.bz2 linux-stable-1fe6b822b335d3781ad466a7bbc3898abcd8d63e.zip | |
ipv4: fix error return code in rtm_to_fib_config()
[ Upstream commit b410f04eb5b482b5efc4eee90de81ad35d3d923b ]
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 <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/1607071695-33740-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ipv4/fib_frontend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index ed2ab03cf971..da994f7e3def 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -835,7 +835,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; |