From mboxrd@z Thu Jan 1 00:00:00 1970 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 98BBBEB64D9 for ; Thu, 29 Jun 2023 19:05:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbjF2TFv (ORCPT ); Thu, 29 Jun 2023 15:05:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233367AbjF2TC6 (ORCPT ); Thu, 29 Jun 2023 15:02:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA60B3C03; Thu, 29 Jun 2023 12:01:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 75A1A615E2; Thu, 29 Jun 2023 19:01:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68917C433C9; Thu, 29 Jun 2023 19:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688065311; bh=IHOl7DVaJ5zd4yNvVL82z0xO/mASETxZTPOpk7yUvNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LfP6mynT7aplOltW3BYySiKf6BCNChYSZD3b2vUQX3qOFysv6tqwu7u9TZ85zJOIh 1RAonazK7BeVEwpTGTQrQ4vnkZL+pNKbUxK1k6dmDp5seTKS59zre5hWJJoA0sOH84 lJqcBmjdmwrZAxnZcP/I2pQaD9VoAXPcT8L6DbKlXh62hQwx9B+u70HK9v39uVKTpy bzhQCIjP4YwNi2ozLakLVo3xSQtnlvDLMmgvELmnxYd57pVKGy6JdB87KbyjF0UVCO oIQiOIVLbkGSmt1fxMiTAytFHOXR8NswOGJNeyNQe4vVqNWGU3w6hVeSD14Sp6BNrT t8Uj8YH3phaTA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pablo Neira Ayuso , Sasha Levin , kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 10/12] netfilter: nf_tables: disallow timeout for anonymous sets Date: Thu, 29 Jun 2023 15:01:30 -0400 Message-Id: <20230629190134.907949-10-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230629190134.907949-1-sashal@kernel.org> References: <20230629190134.907949-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.35 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit e26d3009efda338f19016df4175f354a9bd0a4ab ] Never used from userspace, disallow these parameters. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 13d4913266b4d..564935a12bfcc 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4588,6 +4588,9 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info, if (!(flags & NFT_SET_TIMEOUT)) return -EINVAL; + if (flags & NFT_SET_ANONYMOUS) + return -EOPNOTSUPP; + err = nf_msecs_to_jiffies64(nla[NFTA_SET_TIMEOUT], &desc.timeout); if (err) return err; @@ -4596,6 +4599,10 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info, if (nla[NFTA_SET_GC_INTERVAL] != NULL) { if (!(flags & NFT_SET_TIMEOUT)) return -EINVAL; + + if (flags & NFT_SET_ANONYMOUS) + return -EOPNOTSUPP; + desc.gc_int = ntohl(nla_get_be32(nla[NFTA_SET_GC_INTERVAL])); } -- 2.39.2