diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2022-02-21 11:53:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-02-21 11:53:51 +0100 |
| commit | 6255b48aebfd4dff375e97fc8b075a235848db0b (patch) | |
| tree | bcedf2b959a843a18cf7ebcc9120a0dd1c4e234f /net/ipv6/ip6mr.c | |
| parent | arm64: Support PREEMPT_DYNAMIC (diff) | |
| parent | Linux 5.17-rc5 (diff) | |
| download | linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.tar.xz linux-dev-6255b48aebfd4dff375e97fc8b075a235848db0b.zip | |
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
New conflicts in sched/core due to the following upstream fixes:
44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled")
Conflicts:
include/linux/psi_types.h
kernel/sched/psi.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 7cf73e60e619..8a2db926b5eb 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -243,7 +243,9 @@ static int __net_init ip6mr_rules_init(struct net *net) return 0; err2: + rtnl_lock(); ip6mr_free_table(mrt); + rtnl_unlock(); err1: fib_rules_unregister(ops); return err; |