* [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test
@ 2023-01-23 12:04 Florian Westphal
2023-01-23 16:16 ` Roi Dayan
0 siblings, 1 reply; 5+ messages in thread
From: Florian Westphal @ 2023-01-23 12:04 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal, Roi Dayan
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>
---
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.39.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test
2023-01-23 12:04 [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test Florian Westphal
@ 2023-01-23 16:16 ` Roi Dayan
2023-01-31 12:37 ` Roi Dayan
2023-02-01 11:17 ` Pablo Neira Ayuso
0 siblings, 2 replies; 5+ messages in thread
From: Roi Dayan @ 2023-01-23 16:16 UTC (permalink / raw)
To: Florian Westphal, netfilter-devel
On 23/01/2023 14:04, Florian Westphal wrote:
> 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>
> ---
> 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;
>
Reviewed-by: Roi Dayan <roid@nvidia.com>
thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test
2023-01-23 16:16 ` Roi Dayan
@ 2023-01-31 12:37 ` Roi Dayan
2023-01-31 12:58 ` Pablo Neira Ayuso
2023-02-01 11:17 ` Pablo Neira Ayuso
1 sibling, 1 reply; 5+ messages in thread
From: Roi Dayan @ 2023-01-31 12:37 UTC (permalink / raw)
To: Florian Westphal, netfilter-devel
On 23/01/2023 18:16, Roi Dayan wrote:
>
>
> On 23/01/2023 14:04, Florian Westphal wrote:
>> 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>
>> ---
>> 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;
>>
>
> Reviewed-by: Roi Dayan <roid@nvidia.com>
>
> thanks
hi, just pinging. when is this fix going to be merged?
thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test
2023-01-31 12:37 ` Roi Dayan
@ 2023-01-31 12:58 ` Pablo Neira Ayuso
0 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2023-01-31 12:58 UTC (permalink / raw)
To: Roi Dayan; +Cc: Florian Westphal, netfilter-devel
On Tue, Jan 31, 2023 at 02:37:21PM +0200, Roi Dayan wrote:
>
>
> On 23/01/2023 18:16, Roi Dayan wrote:
> >
> >
> > On 23/01/2023 14:04, Florian Westphal wrote:
> >> 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>
> >> ---
> >> 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;
> >>
> >
> > Reviewed-by: Roi Dayan <roid@nvidia.com>
> >
> > thanks
>
> hi, just pinging. when is this fix going to be merged?
I'll take care of this.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test
2023-01-23 16:16 ` Roi Dayan
2023-01-31 12:37 ` Roi Dayan
@ 2023-02-01 11:17 ` Pablo Neira Ayuso
1 sibling, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2023-02-01 11:17 UTC (permalink / raw)
To: Roi Dayan; +Cc: Florian Westphal, netfilter-devel
On Mon, Jan 23, 2023 at 06:16:21PM +0200, Roi Dayan wrote:
>
>
> On 23/01/2023 14:04, Florian Westphal wrote:
> > 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>
> > ---
> > 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;
> >
>
> Reviewed-by: Roi Dayan <roid@nvidia.com>
Applied, thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-01 11:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-23 12:04 [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test Florian Westphal
2023-01-23 16:16 ` Roi Dayan
2023-01-31 12:37 ` Roi Dayan
2023-01-31 12:58 ` Pablo Neira Ayuso
2023-02-01 11:17 ` Pablo Neira Ayuso
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).