OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b32e91
)
ipv4: fix error return code in rtm_to_fib_config()
author
Zhang Changzhong
<zhangchangzhong@huawei.com>
Fri, 4 Dec 2020 08:48:14 +0000
(16:48 +0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Fri, 4 Dec 2020 23:38:16 +0000
(15:38 -0800)
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>
net/ipv4/fib_frontend.c
patch
|
blob
|
history
diff --git
a/net/ipv4/fib_frontend.c
b/net/ipv4/fib_frontend.c
index
b87140a
..
cdf6ec5
100644
(file)
--- 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;