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 0EC0CC001B0 for ; Thu, 29 Jun 2023 19:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232190AbjF2TFw (ORCPT ); Thu, 29 Jun 2023 15:05:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233068AbjF2TDj (ORCPT ); Thu, 29 Jun 2023 15:03:39 -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 AA0403C2D; Thu, 29 Jun 2023 12:02:04 -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 43B1961627; Thu, 29 Jun 2023 19:02:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A2BAC43397; Thu, 29 Jun 2023 19:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688065323; bh=2HSM9jt94Ioc5k2cDaysedSQk9sOrAH9Flmss0JUBKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSUN/DwP3L+Fk10FVtCGMrM2CtXwPbBrckH4HHAzCiV2+mXDfrYJkywqiuKE0JuGO pwtZkthrrHsTidkBuOqu8sd38R1IZ4GRDiYS+xkbjaUi9+JzklQbEKnNfthdOBuUP7 D7e4VLWksBsRDReBzB8CC9fADl6w6TMOBdjl81qAUHOHPXhgKSktjPC9RmqUr0vXXw 2NuOz8cVdwNbZzJ6rAcoNB7ZkjwJegyq2eV+BLQTuUbRi9y/TBs3FU/EVWoxhpVBEC REbF7FT2obzWiQ4DB31gN1v2kBhzZRAFAR2BxERhac5D5j7K+Qc1RHbZ5GkLLOj8Q4 H7/2M5Flz8CBg== 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 5.15 4/5] netfilter: nf_tables: disallow timeout for anonymous sets Date: Thu, 29 Jun 2023 15:01:55 -0400 Message-Id: <20230629190158.908169-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230629190158.908169-1-sashal@kernel.org> References: <20230629190158.908169-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.118 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 35b9f74f0bc61..72f206b591a6a 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4491,6 +4491,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; @@ -4499,6 +4502,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