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 D204832A3FD; Wed, 8 Apr 2026 18:42:38 +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=1775673758; cv=none; b=AcdEW/HOxMV3CkNM3Y8BHlRp5V/ksWGS3wRFkgp6FNkNGICg8iJPqlJLAvV/jiLnHIRKonjjWQA48JQkV/fwLHGxMdmDLl1AyjZHnbM1NrIKk5SU8Ph3KeMW0u9c/RCESlpi2s/EEWbRIO6/pv4YL0dHeHjMJZ9oJLbvXKprLT0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673758; c=relaxed/simple; bh=vHe/e7KXSrFyTUEvteQdxOxFpqrJRFjIy0+4alVkAGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RE2qB8kykXBaSxP5yBbwdCdSxztY7ThdELhqQzYGexzvccowfpF80RFvsQ5iFje6YZ6AFAPTMMJgQX5LP15c9MJPxUbL1YTepXAVB1A3tUT44/0Zj4AOL2W4CXUMylNmh4F8fwgv49HiJvmYoNf5zrRWzCKIYX4asR85g6TKG2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Mn71H3yz; 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="Mn71H3yz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FD39C2BC9E; Wed, 8 Apr 2026 18:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775673758; bh=vHe/e7KXSrFyTUEvteQdxOxFpqrJRFjIy0+4alVkAGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mn71H3yzaBLXW64XoXZ2N0vlULO9aK529RtQfz7/ac43cE92Rhg7Mvqci9AxVg0ga 4TCAqDjab3LtOdka6xanxap6leLDORD8ak+zlnYlT1FoDa7KHUXn8KYI5jbzGu1ysy orcxoSD/Nh96h4h5TDNpFFfqd4Hh48IW5XN257Ro= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.12 079/242] netfilter: nf_tables: reject immediate NF_QUEUE verdict Date: Wed, 8 Apr 2026 20:01:59 +0200 Message-ID: <20260408175930.040832436@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175927.064985309@linuxfoundation.org> References: <20260408175927.064985309@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit da107398cbd4bbdb6bffecb2ce86d5c9384f4cec ] nft_queue is always used from userspace nftables to deliver the NF_QUEUE verdict. Immediately emitting an NF_QUEUE verdict is never used by the userspace nft tools, so reject immediate NF_QUEUE verdicts. The arp family does not provide queue support, but such an immediate verdict is still reachable. Globally reject NF_QUEUE immediate verdicts to address this issue. Fixes: f342de4e2f33 ("netfilter: nf_tables: reject QUEUE/DROP verdict parameters") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 663c064135181..e373afdf0f072 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -11355,8 +11355,6 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data, switch (data->verdict.code) { case NF_ACCEPT: case NF_DROP: - case NF_QUEUE: - break; case NFT_CONTINUE: case NFT_BREAK: case NFT_RETURN: @@ -11391,6 +11389,11 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data, data->verdict.chain = chain; break; + case NF_QUEUE: + /* The nft_queue expression is used for this purpose, an + * immediate NF_QUEUE verdict should not ever be seen here. + */ + fallthrough; default: return -EINVAL; } -- 2.53.0