Skip to contentSkip to conversation

netfilter: conntrack: udp: fix seen-reply test

PATCH Applied Florian Westphal 3 participants 5 messages Jan 23, 2023 – Feb 1, 2023

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 netfilter: conntrack: udp: fix seen-reply test

IPS_SEEN_REPLY_BIT is only useful for test_bit() api.

Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
---
 net/netfilter/nf_conntrack_proto_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_proto_udp.c +1 -1
index 6b9206635b24..0030fbe8885c 100644
@@ -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;
 
Signature · 1 line
2.39.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Florian Westphal

IPS_SEEN_REPLY_BIT is only useful for test_bit() api.

Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
---
 net/netfilter/nf_conntrack_proto_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_proto_udp.c +0 -0
index 6b9206635b24..0030fbe8885c 100644

net/netfilter/nf_conntrack_proto_udp.c int nf_conntrack_udp_packet(struct nf_conn *ct, · line 110

Quoted 8 lines
net/netfilter/nf_conntrack_proto_udp.c +1 -1
@@ -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;
 

thanks

#2 lore raw
Quoted 28 lines · Roi Dayan
Quoted 14 lines · Florian Westphal

IPS_SEEN_REPLY_BIT is only useful for test_bit() api.

Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
---
 net/netfilter/nf_conntrack_proto_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_proto_udp.c +0 -0
index 6b9206635b24..0030fbe8885c 100644

net/netfilter/nf_conntrack_proto_udp.c int nf_conntrack_udp_packet(struct nf_conn *ct, · line 110

Quoted 8 lines
net/netfilter/nf_conntrack_proto_udp.c +1 -1
@@ -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;
 
Quoted 1 line

thanks

hi, just pinging. when is this fix going to be merged? thanks

#3 lore raw
Quoted 31 lines · Roi Dayan
Quoted 28 lines · Roi Dayan
Quoted 14 lines · Florian Westphal

IPS_SEEN_REPLY_BIT is only useful for test_bit() api.

Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
---
 net/netfilter/nf_conntrack_proto_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_proto_udp.c +0 -0
index 6b9206635b24..0030fbe8885c 100644

net/netfilter/nf_conntrack_proto_udp.c int nf_conntrack_udp_packet(struct nf_conn *ct, · line 110

Quoted 8 lines
net/netfilter/nf_conntrack_proto_udp.c +1 -1
@@ -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;
 
Quoted 3 lines
Quoted 1 line

thanks

hi, just pinging. when is this fix going to be merged?

I'll take care of this.

Thanks.

maintainer Applied
#4 lore raw
In reply to Roi Dayan
Quoted 12 lines · Roi Dayan
Quoted 9 lines · Florian Westphal

IPS_SEEN_REPLY_BIT is only useful for test_bit() api.

Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")
---
 net/netfilter/nf_conntrack_proto_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines

net/netfilter/nf_conntrack_proto_udp.c int nf_conntrack_udp_packet(struct nf_conn *ct, · line 110

Quoted 13 lines
net/netfilter/nf_conntrack_proto_udp.c +1 -1
index 6b9206635b24..0030fbe8885c 100644
@@ -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;
 

Applied, thanks