Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795061945; b=PPTEhCu3qHwtY1y3Hmt8q34cVBjWIBNFGwUZAcOvdTF2QJNBdaooPHkDaUZLbzKuyOcY 1W+OG1upSI8ZwPXRLQlBUy6MvoIoIQBBtA0mk67JAWA7LHaWOX/acK4Ymb0+fpFGdMstE JHfOrxZYY8YTQZf//FRFBtYPk0EVlHmDX9Ir4Seub0qBpi+US1WZCdRmJIdOIelJiFqFM FGC2JT18yoCC6sictTn/dY9yZ1y9S6VOBCuAvuDEQl2oYJN88buHYaqpbK2LJI05xedRa AXc5+0DxwkusJkbBsBGFAp5w8qfwq8v27sWHOfttiGYuixjy/25ykUFECED8pduO+CQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061945; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=w5pKbghth308Pz+wE3WdBYTeowM0tjdsmw3l8Wjqf2M=; b=O0T//wZVvd1Ye3bPED0QsLUYHyKPWOGF6PXR2JR41XrsH6QRowL+ykk2e7QuvnAMvA++ LIOGnGyXdb1zk6e1HCIwaWxPAHuICT2hfs7scAGmmV1xBzJCZzOes3WyRyIqA0u+2ugU0 sehBq2wcZViRX5OIhRQuj5QbKZwmWSNsq3jLE1BZ67oo6L2j2gv28hzGQJpBZzBnO5gKx 0HqEoqXpwW+SBrrzlUqJx2O1EtAv/nBx9Rru2VWxV9gqffPHzCJ/mHDnTvya6qpzgYy9O aFx/jlv9UwR+5VT4xiN+0RIP1tcXQf3E1eMXeu1cKgPNuPhhHxAadi7hWaRdH9TB3qA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=B4iOVcIS; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C575606A325; Thu, 19 Nov 2026 04:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=B4iOVcIS Received: by smtp.kernel.org (Postfix) with ESMTPSA id 926B01F000C4; Thu, 19 Nov 2026 04:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061945; bh=w5pKbghth308Pz+wE3WdBYTeowM0tjdsmw3l8Wjqf2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B4iOVcISQK239IWsfRfBWG8D3VgxUbCf5K+WbkkrVKcwGAmu9OEm/fqCeS5CISIC4 z2npbNKDoKEo3sGS6g8hbFegWdDed4/tVrqLm5v7BJifu+VBSSGXg+cn7E9M54IXI/ gCv6wrPQdaxt1F3A7NJLA8j5Z7KMXJZgsJk0VYic= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joas Antonio dos Santos , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 1693/1848] calipso: update payload_len when removing the CALIPSO option Date: Wed, 18 Nov 2026 16:02:11 +0100 Message-ID: <20261118150030.648307805@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joas Antonio dos Santos [ Upstream commit 00accbd9d5021b942a16078bd5717d7865f6971c ] calipso_skbuff_delattr() removes the CALIPSO option from the hop-by-hop extension header, or the whole extension header if CALIPSO is its only option, and pulls the skb by the removed length. It never updates ipv6hdr->payload_len, so after a successful removal the header still claims the original length. calipso_skbuff_setattr() already adjusts payload_len by the length it adds; the delete path was missed. This is reached on the forward path when a packet carrying CALIPSO is sent to a destination mapped to an unlabeled NetLabel domain. The forwarded packet then has a payload_len larger than its real payload by the removed length (8 to 264 bytes), and the receiver drops it as truncated. So removing the label on the forward path has been broken for every packet that is not resegmented later (SYN, UDP, ICMPv6...). Adjust payload_len after the header is moved. BIG TCP packets carry payload_len == 0 (see ipv6_set_payload_len()), and ipv6_payload_len() then falls back to skb->len, so leave them alone. Tested with client, router and server network namespaces on one kernel (arm64, QEMU): SELinux permissive with a minimal mdp-generated policy (network_peer_controls=1), "netlabelctl calipso add pass doi:16", the default NetLabel mapping left unlabeled, IPv6 forwarding on the router. The client sends 5 UDP datagrams with a CALIPSO hop-by-hop option (DOI 16, set through IPV6_HOPOPTS) to the server through the router: before: router Ip6OutForwDatagrams 5, server receives 0, server Ip6InTruncatedPkts 5 after: router Ip6OutForwDatagrams 5, server receives 5, server Ip6InTruncatedPkts 0 Fixes: 2917f57b6bc1 ("calipso: Allow the lsm to label the skbuff directly.") Signed-off-by: Joas Antonio dos Santos Link: https://patch.msgid.link/179147329205.58079.5847298721173675285@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/calipso.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv6/calipso.c b/net/ipv6/calipso.c index 717ae49ab6480..2aeccea1ec196 100644 --- a/net/ipv6/calipso.c +++ b/net/ipv6/calipso.c @@ -1432,6 +1432,10 @@ static int calipso_skbuff_delattr(struct sk_buff *skb) skb_pull(skb, delta); memmove((char *)ip6_hdr + delta, ip6_hdr, size); skb_reset_network_header(skb); + ip6_hdr = ipv6_hdr(skb); + /* BIG TCP packets have payload_len == 0 */ + if (ip6_hdr->payload_len) + be16_add_cpu(&ip6_hdr->payload_len, -delta); } return 0; -- 2.53.0