From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D7A703F8706; Wed, 20 May 2026 18:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301210; cv=none; b=hGnSeeMEwtA502+t6ow+CH24kSX0BdWuF7j+pTzzaMKGHlEwTzHlMQTVW8g3WJ6WYRMFfLbcKBTEFU9xW7TDzQVgJEuILYLt9khjdgSOPVjgwguOCSAox6jS5P9mNNMJgtGzavERodYYYAec6yKh5E0EqQKymRnIIgIf3uT2gcc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779301210; c=relaxed/simple; bh=XL0AKu7ZfRwAk7itWrlGD9HnMBwOmfWboU5VPRRyMzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M9roXgh/t7dWPJ9wX8kmavEV/B+kanIXTAu0gRvmZ7yVwFFUp7ajoncIebxyULnmVjAdIT0mXVFydAhnPkjj1Q0ufC0q0ZBou5DWu/xPE9ihTYEn1Jw2tbAvB6OfsPTn2gEuR+5hiychnyA3HGL3a5NgnYsnae7EbO/F4pt9M8I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ycvk/43+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ycvk/43+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3722D1F000E9; Wed, 20 May 2026 18:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779301209; bh=XGz5WaWwP7pmYphnbSfAa1S54z9GL/luUpQLa8SUeZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ycvk/43+JKk2LJ1XaF+5qq99YsWmcC0Zcrj9ZDwiBm0Enn1TC/TY++FMrxRJE7sbQ xprZXwSnekNWfXHpXwTduTkfoilGS+WruqDPerr0++9gakCMUzqYbeZbCy0mto5oT1 YncbyHOHTe+cgpLhS1IDlDmaH+22Shzjs6ov2Sl0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Fernando Fernandez Mancera , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.12 467/666] netfilter: nft_osf: restrict it to ipv4 Date: Wed, 20 May 2026 18:21:18 +0200 Message-ID: <20260520162121.391226249@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162111.222830634@linuxfoundation.org> References: <20260520162111.222830634@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 b336fdbb7103fb1484e1dcb6741151d4b5a41e35 ] This expression only supports for ipv4, restrict it. Fixes: b96af92d6eaf ("netfilter: nf_tables: implement Passive OS fingerprint module in nft_osf") Acked-by: Florian Westphal Reviewed-by: Fernando Fernandez Mancera Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_osf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c index 1c0b493ef0a99..bdc2f6c90e2f7 100644 --- a/net/netfilter/nft_osf.c +++ b/net/netfilter/nft_osf.c @@ -28,6 +28,11 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, struct nf_osf_data data; struct tcphdr _tcph; + if (nft_pf(pkt) != NFPROTO_IPV4) { + regs->verdict.code = NFT_BREAK; + return; + } + if (pkt->tprot != IPPROTO_TCP) { regs->verdict.code = NFT_BREAK; return; @@ -114,7 +119,6 @@ static int nft_osf_validate(const struct nft_ctx *ctx, switch (ctx->family) { case NFPROTO_IPV4: - case NFPROTO_IPV6: case NFPROTO_INET: hooks = (1 << NF_INET_LOCAL_IN) | (1 << NF_INET_PRE_ROUTING) | -- 2.53.0