Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1698838iob; Thu, 5 May 2022 06:43:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxP3nFhx33u6JTOFtPFwdfGxzl6hLMsEYmNWKA98I/jO3W5S6vYu+wyEBbpJ1OYeF1C1EhL X-Received: by 2002:a17:907:6d94:b0:6f4:531d:742 with SMTP id sb20-20020a1709076d9400b006f4531d0742mr19549053ejc.202.1651758220308; Thu, 05 May 2022 06:43:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651758220; cv=none; d=google.com; s=arc-20160816; b=QokUczYqyRagWkMW5KVbO7L4lagiUeRk1S6YTKvZKz1hqULHeZl8abz9q1SNPMOC7i EddzIwH9fAHUwy/pXGjfd4O2p4mcRKKqmg+ln4xxcWoFtqy8+2BZlVXohaq2zzlnENTu NP6TKkEluxMvObCmobop57jDBgLe/scwBQj6AJ9fXCE3DqTNvUpnNO75ArQjW9QXoroX +2+obuzSj6QIYNYeci0/nxAI/FUFZTtrT30G9N3eaRKY/ZpkPBO21nXCFi5/mvR5Ztix lYz2hBuWFNjp4LgTAy5GYDZeZidbduXbYmtpFCmHP4d/PcSDQEELu03smYQhSdUaVk6y SPwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=276OFZSE4W+ea61MoYokU+tllPPkyUdblIQehhMfXEw=; b=qqI/EbNTHvMzfIihUkJjWga6DrDBmAQg+iq0NX8PUUmMxrs7dnGyYccT3YSzxe8VF7 P0zyAL2KXhsteImK48lYNnBeGZ6lCtofZKP+wuLMcvbEDEedv42T/HXBl0zj/rn2W2b7 QGf9OMXoGOPEI5+Y5GbPAbuPSZD9EiN2oacvPNxijjkE/spg4jHxA0xh4ORbLk9OCbqy gyYFHXc6Bn0L8LxfhBbgN2WgZYJFJdthwQgiII/MBrrHEIhtSKuymD9XKMF3FBm1s6UB qaCX89Gd40EPYwW+RG5yIq96Mk83U87rZai+d8kWsI2nVfnIu6pwxlL2wth3xZUcs+DP 3KgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a7JSNgph; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a0564021e9000b00425d4bbd155si2504734edf.3.2022.05.05.06.43.16; Thu, 05 May 2022 06:43:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a7JSNgph; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359151AbiEDRrr (ORCPT + 99 others); Wed, 4 May 2022 13:47:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357042AbiEDROp (ORCPT ); Wed, 4 May 2022 13:14:45 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B07653E32; Wed, 4 May 2022 09:58:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 86278CE28AD; Wed, 4 May 2022 16:58:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B889EC385AA; Wed, 4 May 2022 16:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683478; bh=jzTDHvzUt0+FK1GCavcbHjEPmG6peMf7tUCHzlPx87o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a7JSNgphiT42PL/67mkslWNgPtNEQ5LhxoSGv7itkLxaSo+uHT9AtKXsXqFtMdquy jtd5qdtRrKd+P8nhN1ue0MX23ZmCG8CFbH/G3y/45oje9BkOPSoshYaacurc4bm4px 9Szpt0Ictm5zP8bAza7/MfqkE+KjAP0PCJcxBsQI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Volodymyr Mytnyk , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.17 140/225] netfilter: conntrack: fix udp offload timeout sysctl Date: Wed, 4 May 2022 18:46:18 +0200 Message-Id: <20220504153122.718432261@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Volodymyr Mytnyk [ Upstream commit 626873c446f7559d5af8b48cefad903ffd85cf4e ] `nf_flowtable_udp_timeout` sysctl option is available only if CONFIG_NFT_FLOW_OFFLOAD enabled. But infra for this flow offload UDP timeout was added under CONFIG_NF_FLOW_TABLE config option. So, if you have CONFIG_NFT_FLOW_OFFLOAD disabled and CONFIG_NF_FLOW_TABLE enabled, the `nf_flowtable_udp_timeout` is not present in sysfs. Please note, that TCP flow offload timeout sysctl option is present even CONFIG_NFT_FLOW_OFFLOAD is disabled. I suppose it was a typo in commit that adds UDP flow offload timeout and CONFIG_NF_FLOW_TABLE should be used instead. Fixes: 975c57504da1 ("netfilter: conntrack: Introduce udp offload timeout configuration") Signed-off-by: Volodymyr Mytnyk Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_standalone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 3e1afd10a9b6..55aa55b252b2 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -823,7 +823,7 @@ static struct ctl_table nf_ct_sysctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, -#if IS_ENABLED(CONFIG_NFT_FLOW_OFFLOAD) +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) [NF_SYSCTL_CT_PROTO_TIMEOUT_UDP_OFFLOAD] = { .procname = "nf_flowtable_udp_timeout", .maxlen = sizeof(unsigned int), -- 2.35.1