netfilter: conntrack: udp: fix seen-reply test
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: conntrack: udp: fix seen-reply test
IPS_SEEN_REPLY_BIT is only useful for test_bit() api.
--- net/netfilter/nf_conntrack_proto_udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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;
Signature · 1 line
2.39.1
Quoted 14 lines · Florian Westphal
IPS_SEEN_REPLY_BITis only useful fortest_bit()api.Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")Reported-by Roi Dayan <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- net/netfilter/nf_conntrack_proto_udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/netfilter/nf_conntrack_proto_udp.c +0
-0
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
Quoted 28 lines · Roi Dayan
Quoted 14 lines · Florian Westphal
IPS_SEEN_REPLY_BITis only useful fortest_bit()api.Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")Reported-by Roi Dayan <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- net/netfilter/nf_conntrack_proto_udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/netfilter/nf_conntrack_proto_udp.c +0
-0net/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;Reviewed-by Roi Dayan <[email protected]>
Quoted 1 line
thanks
hi, just pinging. when is this fix going to be merged? thanks
Pablo Neira Ayuso
maintainerQuoted 31 lines · Roi Dayan
Quoted 28 lines · Roi Dayan
Quoted 14 lines · Florian Westphal
IPS_SEEN_REPLY_BITis only useful fortest_bit()api.Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")Reported-by Roi Dayan <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- net/netfilter/nf_conntrack_proto_udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/netfilter/nf_conntrack_proto_udp.c +0
-0net/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;Reviewed-by Roi Dayan <[email protected]>
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.
Quoted 12 lines · Roi Dayan
Quoted 9 lines · Florian Westphal
IPS_SEEN_REPLY_BITis only useful fortest_bit()api.Fixes 4883ec512c17 ("netfilter: conntrack: avoid reload of ct->status")Reported-by Roi Dayan <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- 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@@ -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;Reviewed-by Roi Dayan <[email protected]>
Applied, thanks