NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: nf_log: replace BUG_ON by WARN_ON_ONCE when putting logger

Browse source 
[ Upstream commit 259eb32971e9eb24d1777a28d82730659f50fdcb ]

Module reference is bumped for each user, this should not ever happen.

But BUG_ON check should use rcu_access_pointer() instead.

If this ever happens, do WARN_ON_ONCE() instead of BUG_ON() and
consolidate pointer check under the rcu read side lock section.

Fixes: fab4085f4e ("netfilter: log: nf_log_packet() as real unified interface")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pablo Neira Ayuso 2024-01-29 11:09:43 +01:00 • committed by Greg Kroah-Hartman
parent 67f0ca0a4c
commit 9ff981cd65
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net/netfilter/nf_log.c
View file

@ -193,11 +193,12 @@ void nf_logger_put(int pf, enum nf_log_type type)
return; return;
} }
BUG_ON(loggers[pf][type] == NULL);
rcu_read_lock(); rcu_read_lock();
logger = rcu_dereference(loggers[pf][type]); logger = rcu_dereference(loggers[pf][type]);
module_put(logger->me); if (!logger)
WARN_ON_ONCE(1);
else
module_put(logger->me);
rcu_read_unlock(); rcu_read_unlock();
} }
EXPORT_SYMBOL_GPL(nf_logger_put); EXPORT_SYMBOL_GPL(nf_logger_put);