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 C18F73A3517; Sat, 28 Feb 2026 17:37:45 +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=1772300265; cv=none; b=fvT/T0ZZsf5HyKa08R1D91MyslcZhg272r4ItCw79gmxv6J1ZsIpWrlCla42aqMd+3kYiFbnDzVx4Ym6u9zigqVwQ8QJutllWmuT0dzxblSgVwR+OEZtFWYnscTyiDKIKTFTD2B6Z925UX6j/yNj23NloqowW175tjE/LS+m4MM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300265; c=relaxed/simple; bh=on/aqGeJbNw8FM9p0WkiZd/V+zdZqbfsc57tB34OKOg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQqzsbymw67TvLMlNAs1wZ63ZcvuPn8cIE9kKnNyUu/ZIftm7jKbOyR2rbrcDxxiJCJoQl4BTctwFgg0hbuenkTHM0onC4JjhDSnSrz4lVOL4MoITScVOuWeOKjnOHTlCXrXEV87PbIPUhL4gkD+DCP2IJFSKrNmlxqpFhOD+Zs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HGIeG1Ml; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HGIeG1Ml" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13FA1C19423; Sat, 28 Feb 2026 17:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300265; bh=on/aqGeJbNw8FM9p0WkiZd/V+zdZqbfsc57tB34OKOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGIeG1MlvVGH350+a4R0LYICTBfB3GPsrzxlOCj6VdN2NqZfWMkG4ucGF8gI/t2fD Z1qgWy2lalTIbxtDV8jxe/blNE2pWZpBedNaEtveGn5WZEN2Fk3l/zthkjBmniKfuX x4VAiGR1siwO+F3QDJQM9WY1765bCK8etRCH9JzO6Ke465LxW8DycKXecwOSFfifI5 XBL5H2gLwPUWz0UzHE8I7VvZdgCdqvHZ1trGk63TTVA2ZCi/AgbDsGxc23zhVsRJaC ZBVPKP8TlD+U2IgCAwNkWadd6sTv2gUkTN8+XqSU3xAz8obFiisfChkMAbQqaNVmOd Q7Mb535WoNjcw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuto Hamaguchi , Florian Westphal , Sasha Levin Subject: [PATCH 6.19 291/844] netfilter: nf_conntrack: Add allow_clash to generic protocol handler Date: Sat, 28 Feb 2026 12:23:24 -0500 Message-ID: <20260228173244.1509663-292-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Yuto Hamaguchi [ Upstream commit 8a49fc8d8a3e83dc51ec05bcd4007bdea3c56eec ] The upstream commit, 71d8c47fc653711c41bc3282e5b0e605b3727956 ("netfilter: conntrack: introduce clash resolution on insertion race"), sets allow_clash=true in the UDP/UDPLITE protocol handler but does not set it in the generic protocol handler. As a result, packets composed of connectionless protocols at each layer, such as UDP over IP-in-IP, still drop packets due to conflicts during conntrack insertion. To resolve this, this patch sets allow_clash in the nf_conntrack_l4proto_generic. Signed-off-by: Yuto Hamaguchi Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_proto_generic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index e831637bc8ca8..cb260eb3d012c 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c @@ -67,6 +67,7 @@ void nf_conntrack_generic_init_net(struct net *net) const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic = { .l4proto = 255, + .allow_clash = true, #ifdef CONFIG_NF_CONNTRACK_TIMEOUT .ctnl_timeout = { .nlattr_to_obj = generic_timeout_nlattr_to_obj, -- 2.51.0