From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Subject: [PATCH net-next 3/6] netfilter: conntrack: udp: fix seen-reply test
Date: Fri, 17 Feb 2023 13:29:54 +0100 [thread overview]
Message-ID: <20230217122957.799277-4-pablo@netfilter.org> (raw)
In-Reply-To: <20230217122957.799277-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
IPS_SEEN_REPLY_BIT is only useful for test_bit() api.
Fixes: 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
Reported-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_conntrack_proto_udp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 6b9206635b24..0030fbe8885c 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -104,7 +104,7 @@ int nf_conntrack_udp_packet(struct nf_conn *ct,
/* If we've seen traffic both ways, this is some kind of UDP
* stream. Set Assured.
*/
- if (status & IPS_SEEN_REPLY_BIT) {
+ if (status & IPS_SEEN_REPLY) {
unsigned long extra = timeouts[UDP_CT_UNREPLIED];
bool stream = false;
--
2.30.2
next prev parent reply other threads:[~2023-02-17 12:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 12:29 [PATCH net-next 0/6] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2023-02-17 12:29 ` [PATCH net-next 1/6] netfilter: nf_tables: NULL pointer dereference in nf_tables_updobj() Pablo Neira Ayuso
2023-02-20 11:00 ` patchwork-bot+netdevbpf
2023-02-17 12:29 ` [PATCH net-next 2/6] netfilter: nf_tables: fix wrong pointer passed to PTR_ERR() Pablo Neira Ayuso
2023-02-17 12:29 ` Pablo Neira Ayuso [this message]
2023-02-17 12:29 ` [PATCH net-next 4/6] netfilter: conntrack: remote a return value of the 'seq_print_acct' function Pablo Neira Ayuso
2023-02-17 12:29 ` [PATCH net-next 5/6] ipvs: avoid kfree_rcu without 2nd arg Pablo Neira Ayuso
2023-02-17 12:29 ` [PATCH net-next 6/6] netfilter: let reset rules clean out conntrack entries Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230217122957.799277-4-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).