From patchwork Wed Mar 25 16:41:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 2216036 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=172.105.105.114; helo=tor.lore.kernel.org; envelope-from=netfilter-devel+bounces-11411-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4fgtPH6NK2z1y1K for ; Thu, 26 Mar 2026 03:57:23 +1100 (AEDT) Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by tor.lore.kernel.org (Postfix) with ESMTP id CA584318D82E for ; Wed, 25 Mar 2026 16:42:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 258513F788E; Wed, 25 Mar 2026 16:42:00 +0000 (UTC) X-Original-To: netfilter-devel@vger.kernel.org Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [91.216.245.30]) (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 52A0C3BED0C for ; Wed, 25 Mar 2026 16:41:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.245.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456919; cv=none; b=kIvn30I7UL/rRvlNX+Nmp7TX8sOfJFw8mYL9NbzM8V54ndpxxgOit7HC3bCjfxxuOdL3In84m9BzDddo+9dhppI3wnOlRZzKkNvinA6+Eqk2GioBqliKR++NYr6BLOb0SFaT6jGXJAltqpJj9bMgcysBTiv/AX8pLH4fkE4Pbe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456919; c=relaxed/simple; bh=JY2glMILN4+/CG1ObBikjiO/jIVgnDBytAotRygH+Oo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Dkc5F5OHh1hvQgUxrmzkk6sf4TFc8qO7/0Nj0z0NqmmjRNX/xQjq6PGR3QXnPWFggvWv9YMEnclaphUmUPezNlNhAj7mGk1k1zhegM1GBUg2VgrNO7r7TRM//NWY4+wFzes8OmoJgD4ZR0JvsSLJVEOfQbenpWMd6FDAp7NxIOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc; arc=none smtp.client-ip=91.216.245.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc Received: by Chamillionaire.breakpoint.cc (Postfix, from userid 1003) id 0A5716080C; Wed, 25 Mar 2026 17:41:56 +0100 (CET) From: Florian Westphal To: Cc: Florian Westphal , Hyunwoo Kim Subject: [PATCH nf] netfilter: nf_tables: reject requests exceeding NF_FLOW_RULE_ACTION_MAX actions Date: Wed, 25 Mar 2026 17:41:27 +0100 Message-ID: <20260325164130.29060-1-fw@strlen.de> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 nf_flow_offload_rule_alloc() allocates space for NF_FLOW_RULE_ACTION_MAX entries. Make sure userspace passes more entries to us. Reported-by: Hyunwoo Kim Signed-off-by: Florian Westphal --- Can also route via nf-next if thats deemed the better tree. include/net/netfilter/nf_flow_table.h | 2 ++ net/netfilter/nf_flow_table_offload.c | 2 -- net/netfilter/nf_tables_offload.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h index b09c11c048d5..0b2fb1467b3f 100644 --- a/include/net/netfilter/nf_flow_table.h +++ b/include/net/netfilter/nf_flow_table.h @@ -13,6 +13,8 @@ #include #include +#define NF_FLOW_RULE_ACTION_MAX 16 + struct nf_flowtable; struct nf_flow_rule; struct flow_offload; diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c index 9b677e116487..11463682bbfa 100644 --- a/net/netfilter/nf_flow_table_offload.c +++ b/net/netfilter/nf_flow_table_offload.c @@ -727,8 +727,6 @@ int nf_flow_rule_route_ipv6(struct net *net, struct flow_offload *flow, } EXPORT_SYMBOL_GPL(nf_flow_rule_route_ipv6); -#define NF_FLOW_RULE_ACTION_MAX 16 - static struct nf_flow_rule * nf_flow_offload_rule_alloc(struct net *net, const struct flow_offload_work *offload, diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c index 9101b1703b52..a2f7966bc201 100644 --- a/net/netfilter/nf_tables_offload.c +++ b/net/netfilter/nf_tables_offload.c @@ -88,10 +88,11 @@ static void nft_flow_rule_transfer_vlan(struct nft_offload_ctx *ctx, struct nft_flow_rule *nft_flow_rule_create(struct net *net, const struct nft_rule *rule) { + unsigned int num_actions = 0; struct nft_offload_ctx *ctx; struct nft_flow_rule *flow; - int num_actions = 0, err; struct nft_expr *expr; + int err; expr = nft_expr_first(rule); while (nft_expr_more(rule, expr)) { @@ -102,7 +103,7 @@ struct nft_flow_rule *nft_flow_rule_create(struct net *net, expr = nft_expr_next(expr); } - if (num_actions == 0) + if (num_actions == 0 || num_actions > NF_FLOW_RULE_ACTION_MAX) return ERR_PTR(-EOPNOTSUPP); flow = nft_flow_rule_alloc(num_actions);