diff options
| author | David S. Miller <davem@davemloft.net> | 2023-02-20 10:53:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-02-20 10:53:56 +0000 |
| commit | 1155a2281de9e7c08c5c6e265b32b28d1fe9ea07 (patch) | |
| tree | 275c9e476ba3ec43ed530e9ef88438e5ac430460 /net/netfilter/ipvs | |
| parent | 129ff4de58ff0ca981b833834d8b9bddb71d4bfe (diff) | |
| parent | 2954fe60e33da0f4de4d81a4c95c7dddb517d00c (diff) | |
| download | linux-stable-1155a2281de9e7c08c5c6e265b32b28d1fe9ea07.tar.gz linux-stable-1155a2281de9e7c08c5c6e265b32b28d1fe9ea07.tar.bz2 linux-stable-1155a2281de9e7c08c5c6e265b32b28d1fe9ea07.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
The following patchset contains Netfilter updates for net-next:
1) Add safeguard to check for NULL tupe in objects updates via
NFT_MSG_NEWOBJ, this should not ever happen. From Alok Tiwari.
2) Incorrect pointer check in the new destroy rule command,
from Yang Yingliang.
3) Incorrect status bitcheck in nf_conntrack_udp_packet(),
from Florian Westphal.
4) Simplify seq_print_acct(), from Ilia Gavrilov.
5) Use 2-arg optimal variant of kfree_rcu() in IPVS,
from Julian Anastasov.
6) TCP connection enters CLOSE state in conntrack for locally
originated TCP reset packet from the reject target,
from Florian Westphal.
The fixes #2 and #3 in this series address issues from the previous pull
nf-next request in this net-next cycle.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c index ce2a1549b304..c5970ba416ae 100644 --- a/net/netfilter/ipvs/ip_vs_est.c +++ b/net/netfilter/ipvs/ip_vs_est.c @@ -549,7 +549,7 @@ void ip_vs_stop_estimator(struct netns_ipvs *ipvs, struct ip_vs_stats *stats) __set_bit(row, kd->avail); if (!kd->tick_len[row]) { RCU_INIT_POINTER(kd->ticks[row], NULL); - kfree_rcu(td); + kfree_rcu(td, rcu_head); } kd->est_count--; if (kd->est_count) { |