korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 08:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipvs: avoid kfree_rcu without 2nd arg

Browse Source 
Avoid possible synchronize_rcu() as part from the
kfree_rcu() call when 2nd arg is not provided.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Julian Anastasov 2023-02-01 19:56:53 +02:00 committed by Pablo Neira Ayuso
parent f6477ec62f
commit e4d0fe71f5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/ip_vs.h
View File

@ -461,6 +461,7 @@ void ip_vs_stats_free(struct ip_vs_stats *stats);
/* Multiple chains processed in same tick */ /* Multiple chains processed in same tick */
struct ip_vs_est_tick_data { struct ip_vs_est_tick_data {
struct rcu_head rcu_head;
struct hlist_head chains[IPVS_EST_TICK_CHAINS]; struct hlist_head chains[IPVS_EST_TICK_CHAINS];
DECLARE_BITMAP(present, IPVS_EST_TICK_CHAINS); DECLARE_BITMAP(present, IPVS_EST_TICK_CHAINS);
DECLARE_BITMAP(full, IPVS_EST_TICK_CHAINS); DECLARE_BITMAP(full, IPVS_EST_TICK_CHAINS);

2
net/netfilter/ipvs/ip_vs_est.c
View File

@ -549,7 +549,7 @@ void ip_vs_stop_estimator(struct netns_ipvs *ipvs, struct ip_vs_stats *stats)
__set_bit(row, kd->avail); __set_bit(row, kd->avail);
if (!kd->tick_len[row]) { if (!kd->tick_len[row]) {
RCU_INIT_POINTER(kd->ticks[row], NULL); RCU_INIT_POINTER(kd->ticks[row], NULL);
kfree_rcu(td); kfree_rcu(td, rcu_head);
} }
kd->est_count--; kd->est_count--;
if (kd->est_count) { if (kd->est_count) {