* [PATCH] netfilter:get_next_corpse():No need to double check the *bucket
@ 2019-10-01 8:24 wh_bin
2019-10-01 9:37 ` Florian Westphal
0 siblings, 1 reply; 2+ messages in thread
From: wh_bin @ 2019-10-01 8:24 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, coreteam, netdev, linux-kernel, wh_bin
From: Hongbin Wang <wh_bin@126.com>
The *bucket is in for loops,it has been checked.
Signed-off-by: Hongbin Wang <wh_bin@126.com>
---
net/netfilter/nf_conntrack_core.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 0c63120b2db2..8d48babe6561 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2000,14 +2000,12 @@ get_next_corpse(int (*iter)(struct nf_conn *i, void *data),
lockp = &nf_conntrack_locks[*bucket % CONNTRACK_LOCKS];
local_bh_disable();
nf_conntrack_lock(lockp);
- if (*bucket < nf_conntrack_htable_size) {
- hlist_nulls_for_each_entry(h, n, &nf_conntrack_hash[*bucket], hnnode) {
- if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
- continue;
- ct = nf_ct_tuplehash_to_ctrack(h);
- if (iter(ct, data))
- goto found;
- }
+ hlist_nulls_for_each_entry(h, n, &nf_conntrack_hash[*bucket], hnnode) {
+ if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
+ continue;
+ ct = nf_ct_tuplehash_to_ctrack(h);
+ if (iter(ct, data))
+ goto found;
}
spin_unlock(lockp);
local_bh_enable();
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netfilter:get_next_corpse():No need to double check the *bucket
2019-10-01 8:24 [PATCH] netfilter:get_next_corpse():No need to double check the *bucket wh_bin
@ 2019-10-01 9:37 ` Florian Westphal
0 siblings, 0 replies; 2+ messages in thread
From: Florian Westphal @ 2019-10-01 9:37 UTC (permalink / raw)
To: wh_bin; +Cc: pablo, netfilter-devel, coreteam, netdev, linux-kernel
wh_bin@126.com <wh_bin@126.com> wrote:
> From: Hongbin Wang <wh_bin@126.com>
>
> The *bucket is in for loops,it has been checked.
>
> Signed-off-by: Hongbin Wang <wh_bin@126.com>
> ---
> net/netfilter/nf_conntrack_core.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
> index 0c63120b2db2..8d48babe6561 100644
> --- a/net/netfilter/nf_conntrack_core.c
> +++ b/net/netfilter/nf_conntrack_core.c
> @@ -2000,14 +2000,12 @@ get_next_corpse(int (*iter)(struct nf_conn *i, void *data),
> lockp = &nf_conntrack_locks[*bucket % CONNTRACK_LOCKS];
> local_bh_disable();
> nf_conntrack_lock(lockp);
> - if (*bucket < nf_conntrack_htable_size) {
> - hlist_nulls_for_each_entry(h, n, &nf_conntrack_hash[*bucket], hnnode) {
> - if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
> - continue;
> - ct = nf_ct_tuplehash_to_ctrack(h);
> - if (iter(ct, data))
> - goto found;
> - }
> + hlist_nulls_for_each_entry(h, n, &nf_conntrack_hash[*bucket], hnnode) {
I don't think this is correct.
unless we hold nf_conntrack_lock() nf_conntrack_hash[] could be
reallocated, no?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-01 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-01 8:24 [PATCH] netfilter:get_next_corpse():No need to double check the *bucket wh_bin
2019-10-01 9:37 ` Florian Westphal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).