Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7273cb18 authored by zhang kai's avatar zhang kai Committed by Greg Kroah-Hartman
Browse files

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: default avatarzhang kai <zhangkaiheb@126.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7432ecc5

net/ipv6/ip6_fib.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}