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 C53413242D7; Sat, 30 May 2026 17:23:19 +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=1780161800; cv=none; b=onqa01dicyNdSYtjNIJXAFY50uwmSkB+dYQdyFnEjStK98moesFG2QsYgn0cxuIqaEPtdLq08NJ0nytO/k9jm9Mz3AdYlJR7L5mNIGEAvgva1rhz5apnqURffbEwtTrAT0fApXcZ9ZZdUupl3L8kbOmDV6ykOTSy+vWOaxlhSJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161800; c=relaxed/simple; bh=Wqpck2rC7bSFEWn/til3G0sFdykuAZMtEIh9yH9JAMk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q8MtgtGpQORFenkgrXJMBJWVsgsapGxPQi5fPC8ZND1ob7FX6tCmV1BOeiynBvPMer+bHWI0lLxlg+9Yn3Ogv6PdrFn2aEF62murVgwERfgweRns6NL1Gl3S+v5azRd7uwOU+l7TT7QOy/tLyElrhHlYXTxvJCQ2aj/8BI/WP9Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NlyI08D5; 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="NlyI08D5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B66051F00893; Sat, 30 May 2026 17:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161799; bh=KYvgTKpK7IU9NVMX3Hnwzsf9Ojj/q7QmGfEqQdLrz4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NlyI08D5m0IZMkbbAIo2cyd7Js3Z6fydRHaVzuU8TkMvt6DcOvW2WCb1KBqyoDyOS XBrSxnmk1BqXISMsony5eEfUdVnoPc243Sn+AzGd0GhvzTXduOjeGQ3Pnjo5oghyOo ykYqpS9uVOC6NLUZcDuPKbi9JLJE+0KqfABMrddM= 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.1 700/969] netfilter: nft_osf: restrict it to ipv4 Date: Sat, 30 May 2026 18:03:44 +0200 Message-ID: <20260530160319.847266570@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 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.1-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 adacf95b6e2bd..9bf2dfd351846 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; @@ -119,7 +124,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