From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795025005; b=c/eQgHvDeJZJy/NCG23KZ1ShdJqjoTzsldJt7LOvfpMdXsK/CBCr3MLhMPdOj6+igyG3 US9kHaMq+5wM6Ayn+irqRuO6evb59K4YJbOZz/F9Tj7X6ayty9zZFaUeA0zv9mUQYUg4C nA+JdGULdJi10ZZwzwIBOlcOBHs1nN+fF5XdYMbJz88Xr4whAWthaodFLcVUFalmq/sUk jqmlFZZ94JrE3GfV3Xz9gsnxNEqLijg+rtvmnwXck1AgVEKwCqOEPE12Zs9VFk48d+oDT Zz/1Sxu9zvNuiJP/XXulQlnaoJU/ZF37Iypnc1/BcZaPJjckwgNqp/ej6IKnc+WNMpg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795025005; 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=6u/xt/nQifFwYH1qzspTefxxZ1S4Oeyy9CdK0PPdMgI=; b=pzw5QMdUC9JbvRvrU4eGLu48NuVRj2CmhKr1yhNwyQ7przO8R4migoyK5zIiXMyDOpLs VcgtubAGladNYOwQEWsbeIGW8ZvAILGRHFv/YkxvFL2RIqOM7R5fxG1PMCBOXgHgGQYZp eHaR2AhRkANuQEerx3MUQMy0cIkrytf73PFP4+FfkhorcF2la2WrCfhu0mfriZHlEEjPH 6wJ3dbdNxtm7eicSddoDyK/25aYlpPuSXdsHXMJiAp5pnBCQxkF1fTLoQnyfHCcbGASuY UH6phGXGTsr0q8EWH9Ffa6LG+6jkKdmR3g4CpZuaapnT/4caFNZ3n0QaSpw9iC06+uQ== 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=hXO+Uq1K; 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 0EE27606A331; Wed, 18 Nov 2026 18:03:25 +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=hXO+Uq1K Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62E6D1F000C5; Wed, 18 Nov 2026 18:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795025004; bh=6u/xt/nQifFwYH1qzspTefxxZ1S4Oeyy9CdK0PPdMgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hXO+Uq1KAlD6Qqh3k7Zshe0DW4QLXFwLrywlmZXFOLAF29jLvqlkRm+y9R+vrwwh7 kxNt5SYC0cBrt3bR6CoTA9MBP8GcutfOQyqRio/X0MK6ZnppIbDlbHtD+fjX7VnCLv VyFmdDDO8dB8Pgc9ZTGEFTwU8K0pFfDP5aUzlxkQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuya Kusakabe , Andrea Mayer , Paolo Abeni , Sasha Levin Subject: [PATCH 6.18 0927/2151] seg6: fix HMAC validation when an extension header precedes the SRH Date: Wed, 18 Nov 2026 15:44:22 +0100 Message-ID: <20261118150156.237274163@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuya Kusakabe [ Upstream commit f9cb4d296d81adb0923546ca5d54fae57a81af52 ] seg6_hmac_validate_skb() derived the SRH from skb_transport_header(). That only holds while the two coincide, which is not true on the seg6_local input path. ip6_rcv_core() leaves the transport header just past the IPv6 header. A Hop-by-Hop options header is consumed before the route lookup and advances it, but a Destination Options header is not: the seg6_local lwtunnel is entered through an input redirect from the route lookup, which bypasses the extension header handlers. The transport header then still points at the Destination Options header while seg6_get_srh() has located the real SRH further down the chain. The HMAC is therefore computed over the Destination Options header, and a packet carrying a valid HMAC TLV is dropped when seg6_require_hmac is set. Such a packet is legitimate: RFC 8200 allows Destination Options before a routing header, and get_srh() has walked the header chain since commit 5829d70b0b6c ("ipv6: sr: fix get_srh() to comply with IPv6 standard "RFC 8200""). With a Fragment or an Authentication header in front of the SRH, the same mistake also reads past the data pulled by seg6_get_srh(). This happens before seg6_require_hmac is read, so the default configuration is affected. Reproduce by giving a node a seg6local End SID with net.ipv6.conf..seg6_require_hmac=1 and a key installed with "ip sr hmac set sha1", then sending IPv6 -> Destination Options -> SRH (carrying a valid HMAC TLV) -> payload to that SID: it is dropped, while the same packet without the Destination Options header passes. Fixes: 5829d70b0b6c ("ipv6: sr: fix get_srh() to comply with IPv6 standard "RFC 8200"") Assisted-by: LLM Signed-off-by: Yuya Kusakabe Reviewed-by: Andrea Mayer Link: https://patch.msgid.link/20260926-b4-seg6-hmac-transport-header-v2-1-8087b76f6375@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- include/net/seg6_hmac.h | 3 ++- net/ipv6/exthdrs.c | 2 +- net/ipv6/seg6_hmac.c | 5 +---- net/ipv6/seg6_local.c | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/net/seg6_hmac.h b/include/net/seg6_hmac.h index e9f41725933e4..3161a8104b897 100644 --- a/include/net/seg6_hmac.h +++ b/include/net/seg6_hmac.h @@ -48,7 +48,8 @@ extern int seg6_hmac_info_add(struct net *net, u32 key, extern int seg6_hmac_info_del(struct net *net, u32 key); extern int seg6_push_hmac(struct net *net, struct in6_addr *saddr, struct ipv6_sr_hdr *srh); -extern bool seg6_hmac_validate_skb(struct sk_buff *skb); +extern bool seg6_hmac_validate_skb(struct sk_buff *skb, + struct ipv6_sr_hdr *srh); #ifdef CONFIG_IPV6_SEG6_HMAC extern int seg6_hmac_net_init(struct net *net); extern void seg6_hmac_net_exit(struct net *net); diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 1cd9e800746bd..38f15948237c6 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -390,7 +390,7 @@ static int ipv6_srh_rcv(struct sk_buff *skb, struct inet6_dev *idev) } #ifdef CONFIG_IPV6_SEG6_HMAC - if (!seg6_hmac_validate_skb(skb)) { + if (!seg6_hmac_validate_skb(skb, hdr)) { kfree_skb(skb); return -1; } diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c index e6964c6b0d381..bd2704d4c7a0f 100644 --- a/net/ipv6/seg6_hmac.c +++ b/net/ipv6/seg6_hmac.c @@ -173,13 +173,12 @@ EXPORT_SYMBOL(seg6_hmac_compute); * * called with rcu_read_lock() */ -bool seg6_hmac_validate_skb(struct sk_buff *skb) +bool seg6_hmac_validate_skb(struct sk_buff *skb, struct ipv6_sr_hdr *srh) { u8 hmac_output[SEG6_HMAC_FIELD_LEN]; struct net *net = dev_net(skb->dev); struct seg6_hmac_info *hinfo; struct sr6_tlv_hmac *tlv; - struct ipv6_sr_hdr *srh; struct inet6_dev *idev; int require_hmac; @@ -187,8 +186,6 @@ bool seg6_hmac_validate_skb(struct sk_buff *skb) if (!idev) return false; - srh = (struct ipv6_sr_hdr *)skb_transport_header(skb); - tlv = seg6_get_tlv_hmac(srh); require_hmac = READ_ONCE(idev->cnf.seg6_require_hmac); diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c index d1070aec7b72b..67eeb27ee43a8 100644 --- a/net/ipv6/seg6_local.c +++ b/net/ipv6/seg6_local.c @@ -222,7 +222,7 @@ static struct ipv6_sr_hdr *get_and_validate_srh(struct sk_buff *skb) return NULL; #ifdef CONFIG_IPV6_SEG6_HMAC - if (!seg6_hmac_validate_skb(skb)) + if (!seg6_hmac_validate_skb(skb, srh)) return NULL; #endif @@ -239,7 +239,7 @@ static bool decap_and_validate(struct sk_buff *skb, int proto) return false; #ifdef CONFIG_IPV6_SEG6_HMAC - if (srh && !seg6_hmac_validate_skb(skb)) + if (srh && !seg6_hmac_validate_skb(skb, srh)) return false; #endif @@ -771,7 +771,7 @@ static int end_flv8986_core(struct sk_buff *skb, struct seg6_local_lwt *slwt) srhoff = srh ? ((unsigned char *)srh - skb->data) : 0; pinfo = seg6_get_srh_pktinfo(srh); #ifdef CONFIG_IPV6_SEG6_HMAC - if (srh && !seg6_hmac_validate_skb(skb)) + if (srh && !seg6_hmac_validate_skb(skb, srh)) goto drop; #endif flvmask = finfo->flv_ops; -- 2.53.0