From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0CD5157E8F; Mon, 29 Jan 2024 17:09:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548165; cv=none; b=ZetMFOWV40FZP/5eJV7MQruU/CQk0X5ZfhWLqEGAXAwlXmtcFj3pz1S223y5s54t0dFyltqxt2wBYQCcTJXFsNUyfIau4gEaO7++Glp+vj9UPPCMWyN6lV43M9c8+u9RUWZ9ZJfWY0Tw6+P4UqB0+eku+vczrvO5VSX/BPgKCWU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548165; c=relaxed/simple; bh=KuM/MpGDWAKhShvbTxaNFPiGd4OlfTncISfsKRrNBtA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dRHr1ul9wbstlRa0b3Z5tmAWCGzONlebs8ScShEKqO+anBDEM4eko7QXcy5Ie4a6XJPPpdHRBVNMx9tYzLfYFn1YhkVs/J81UFgUoef5/WljyRcK73KyezfhgcpB+NVLmJbmAVrrHMJrbokouplyQ+2KRbrchVspmjqTmyCAFZg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YvHjeqdt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YvHjeqdt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8892CC43399; Mon, 29 Jan 2024 17:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548165; bh=KuM/MpGDWAKhShvbTxaNFPiGd4OlfTncISfsKRrNBtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YvHjeqdt74bxcAgoxpvoLUKGWRGJYmviKsQ6cIbdik9L0hOgYbD7hdz7aF/OzcpWW 5IQiooVp+aH2JwnJSxaoFqJEuBLtpRHuyltESMEmTisnzcaLxU0uKqcXXz6YuQcIkr h8dlzVDr/bgQc/BkICcCyolkEolwWAME7XS45k+A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.7 200/346] netfilter: nf_tables: restrict anonymous set and map names to 16 bytes Date: Mon, 29 Jan 2024 09:03:51 -0800 Message-ID: <20240129170022.284081430@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170016.356158639@linuxfoundation.org> References: <20240129170016.356158639@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal [ Upstream commit b462579b2b86a8f5230543cadd3a4836be27baf7 ] nftables has two types of sets/maps, one where userspace defines the name, and anonymous sets/maps, where userspace defines a template name. For the latter, kernel requires presence of exactly one "%d". nftables uses "__set%d" and "__map%d" for this. The kernel will expand the format specifier and replaces it with the smallest unused number. As-is, userspace could define a template name that allows to move the set name past the 256 bytes upperlimit (post-expansion). I don't see how this could be a problem, but I would prefer if userspace cannot do this, so add a limit of 16 bytes for the '%d' template name. 16 bytes is the old total upper limit for set names that existed when nf_tables was merged initially. Fixes: 387454901bd6 ("netfilter: nf_tables: Allow set names of up to 255 chars") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index f032c29f1da6..5282e8377782 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -24,6 +24,7 @@ #include #define NFT_MODULE_AUTOLOAD_LIMIT (MODULE_NAME_LEN - sizeof("nft-expr-255-")) +#define NFT_SET_MAX_ANONLEN 16 unsigned int nf_tables_net_id __read_mostly; @@ -4411,6 +4412,9 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, if (p[1] != 'd' || strchr(p + 2, '%')) return -EINVAL; + if (strnlen(name, NFT_SET_MAX_ANONLEN) >= NFT_SET_MAX_ANONLEN) + return -EINVAL; + inuse = (unsigned long *)get_zeroed_page(GFP_KERNEL); if (inuse == NULL) return -ENOMEM; -- 2.43.0