Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB865C636D3 for ; Wed, 1 Feb 2023 11:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231438AbjBALRs (ORCPT ); Wed, 1 Feb 2023 06:17:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231995AbjBALRq (ORCPT ); Wed, 1 Feb 2023 06:17:46 -0500 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 054E6CDCB for ; Wed, 1 Feb 2023 03:17:45 -0800 (PST) Date: Wed, 1 Feb 2023 12:17:41 +0100 From: Pablo Neira Ayuso To: Roi Dayan Cc: Florian Westphal , netfilter-devel Subject: Re: [PATCH nf-next] netfilter: conntrack: udp: fix seen-reply test Message-ID: References: <20230123120433.98002-1-fw@strlen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 > > Signed-off-by: Florian Westphal > > --- > > 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 Applied, thanks