projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
918e83c
)
ipv4: Fix error return code in fib_table_insert()
author
Ziyang Xuan
<william.xuanziyang@huawei.com>
Sun, 20 Nov 2022 07:28:38 +0000
(15:28 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 2 Dec 2022 16:41:07 +0000
(17:41 +0100)
[ Upstream commit
568fe84940ac0e4e0b2cd7751b8b4911f7b9c215
]
In fib_table_insert(), if the alias was already inserted, but node not
exist, the error code should be set before return from error handling path.
Fixes:
a6c76c17df02
("ipv4: Notify route after insertion to the routing table")
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Link:
https://lore.kernel.org/r/20221120072838.2167047-1-william.xuanziyang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv4/fib_trie.c
patch
|
blob
|
history
diff --git
a/net/ipv4/fib_trie.c
b/net/ipv4/fib_trie.c
index
19c6e7b
..
52f9f69
100644
(file)
--- a/
net/ipv4/fib_trie.c
+++ b/
net/ipv4/fib_trie.c
@@
-1375,8
+1375,10
@@
int fib_table_insert(struct net *net, struct fib_table *tb,
/* The alias was already inserted, so the node must exist. */
l = l ? l : fib_find_node(t, &tp, key);
- if (WARN_ON_ONCE(!l))
+ if (WARN_ON_ONCE(!l)) {
+ err = -ENOENT;
goto out_free_new_fa;
+ }
if (fib_find_alias(&l->leaf, new_fa->fa_slen, 0, 0, tb->tb_id, true) ==
new_fa) {