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 3FE61B67E; Wed, 8 Apr 2026 18:22:15 +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=1775672535; cv=none; b=gEoiHyBbRaPujUXAmv+6DYjafavvF5nMlss0TxwWcLqV1eZBU0EaiXQMzMBC5/8Gxx6spUGOt9gM0pthdhjdmDiQyTpiHD7CCdQFFsjZz8gNXZE4Oh/mV7E/qhCG8O6MSy70HEH1KtkLd/H0uEoO9M8H4hk7vevxr0IXTZbgmjw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775672535; c=relaxed/simple; bh=As49cmFz0yrrPged38OdTsC/1Tq2ewIAJUPfr6zWN28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxdx/EGbn6Zt3+687YsqJXQv+5jWzBj/EgAk6MraEYmq08njZMVY6a/6kn2z6apKzETdJ9S+MHRVZ+HLadXKU2SpibpZRQ4yuDMRCgJ6WZyy2TR4ZxsKHsCAXd6hof5qaKBpLwtlez+VPO60un4BwaPDXE1wn8gtjTBCXy0vq9o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ILs4tRVI; 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="ILs4tRVI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA124C19421; Wed, 8 Apr 2026 18:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775672535; bh=As49cmFz0yrrPged38OdTsC/1Tq2ewIAJUPfr6zWN28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILs4tRVI+hchpSytfn1hTK0zrLbcDS9h1QYfwQd2bj50246A1iWZXikCDOnBrxhem MLB1vpGiz03PKWVoY6TeDtcsXXKilhWAkrl81N9WiwAi6g2ok+znJzRCXuLMnyYtyV TwqTAWg9KS5KnUBmmRqH2Z0Q6fiArCrPI1TEGPG8= 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.6 045/160] netfilter: nf_tables: reject immediate NF_QUEUE verdict Date: Wed, 8 Apr 2026 20:02:12 +0200 Message-ID: <20260408175914.892451307@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175913.177092714@linuxfoundation.org> References: <20260408175913.177092714@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.6-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 b411abe9743b7..0aaddc1131c65 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -11105,8 +11105,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: @@ -11141,6 +11139,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