diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-03 11:55:12 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-03 11:55:12 -0800 |
| commit | 80901bff812984624918d9d03f9286e3245ee9a5 (patch) | |
| tree | 945b0f2416cb904e5a178f2d099958b510ed1d56 /net/netfilter/core.c | |
| parent | 25bf4df4d18b4546a5821d77b5fac149a3a4961f (diff) | |
| parent | b949c21fc23ecaccef89582f251e6281cad1f81e (diff) | |
| download | linux-80901bff812984624918d9d03f9286e3245ee9a5.tar.gz linux-80901bff812984624918d9d03f9286e3245ee9a5.tar.bz2 linux-80901bff812984624918d9d03f9286e3245ee9a5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/batman-adv/hard-interface.c
commit 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check")
commit 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message")
https://lore.kernel.org/all/20220302163049.101957-1-sw@simonwunderlich.de/
net/smc/af_smc.c
commit 4d08b7b57ece ("net/smc: Fix cleanup when register ULP fails")
commit 462791bbfa35 ("net/smc: add sysctl interface for SMC")
https://lore.kernel.org/all/20220302112209.355def40@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/netfilter/core.c')
| -rw-r--r-- | net/netfilter/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index d1c9dfbb11fa..9a4feb922cf6 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -428,14 +428,15 @@ static int __nf_register_net_hook(struct net *net, int pf, p = nf_entry_dereference(*pp); new_hooks = nf_hook_entries_grow(p, reg); - if (!IS_ERR(new_hooks)) + if (!IS_ERR(new_hooks)) { + hooks_validate(new_hooks); rcu_assign_pointer(*pp, new_hooks); + } mutex_unlock(&nf_hook_mutex); if (IS_ERR(new_hooks)) return PTR_ERR(new_hooks); - hooks_validate(new_hooks); #ifdef CONFIG_NETFILTER_INGRESS if (nf_ingress_hook(reg, pf)) net_inc_ingress_queue(); |