summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhang kai <zhangkaiheb@126.com>2021-09-09 11:39:18 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-30 11:09:24 +0300
commit7273cb182f13b0ebd2e120a268cde6ea9dc45c28 (patch)
treea8e563b0d9c9b7705309d5a6355f85b70143daa7
parent7432ecc55fe956e896aff1c62dea981949d1bcff (diff)
downloadlinux-7273cb182f13b0ebd2e120a268cde6ea9dc45c28.tar.xz
ipv6: delay fib6_sernum increase in fib6_add
[ Upstream commit e87b5052271e39d62337ade531992b7e5d8c2cfa ] only increase fib6_sernum in net namespace after add fib6_info successfully. Signed-off-by: zhang kai <zhangkaiheb@126.com> Reviewed-by: David Ahern <dsahern@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/ipv6/ip6_fib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index bb68290ad68d..9a6f66e0e9a2 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1310,7 +1310,6 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
int err = -ENOMEM;
int allow_create = 1;
int replace_required = 0;
- int sernum = fib6_new_sernum(info->nl_net);
if (info->nlh) {
if (!(info->nlh->nlmsg_flags & NLM_F_CREATE))
@@ -1410,7 +1409,7 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt,
if (!err) {
if (rt->nh)
list_add(&rt->nh_list, &rt->nh->f6i_list);
- __fib6_update_sernum_upto_root(rt, sernum);
+ __fib6_update_sernum_upto_root(rt, fib6_new_sernum(info->nl_net));
fib6_start_gc(info->nl_net, rt);
}