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 C82DB3469FC; Sat, 30 May 2026 18:44:03 +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=1780166644; cv=none; b=fIiZAcxSnD0co9I3bIo8CWmWQYwaR1Yq0IUHRE1H8NECr3wP/RmrCnGPqMiEeEQ/u5fa9R8MMzjPDvF9N8m5ArQXaGFc54y2gt5er4MFTM+QnF7kIg4hr5DYru1tzfDCYtDckVRS05f3aP4RhJvGdnTKooVAt1QAMxL5ZKqzNhU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780166644; c=relaxed/simple; bh=fAZAgAOTUHXYbzy+Dq52RT53jP9j2M2DbbkLHXCze5Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LERqJAAI0UVwpGJ1gj1OE23xQ93h+GgdmYD6ea8YpjX244VMqHIoNyeS/0Cx7gS+glNVeLfZAUawzsQsrb253sOnX3a99zIGC1fzxtJmuFQ1XOqpu7ecCSRuYmTXBbgEp0zWYXpi/VNaPhs+bJOSZrYnoSkwWYf6Wxy4aaMo044= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x2C1eCQE; 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="x2C1eCQE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 218C11F00893; Sat, 30 May 2026 18:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780166643; bh=AMi4GasxxehWMRjvqDTnuaPMLU3Cq3+Ik5eGkK9vlEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=x2C1eCQEmoGQWz8QA/HqEPQgnw/amtrkWZxomPMAV8DlDFb4g9jzzmEmZiCtbqf1B j3xbdcRwzEM8qFnW3WszfnbP86Toeuibixd5RpMq6xI019w5KWrX5c7bALSKkw37PS S7BAVsfSquUCaG+W4IguH9LC22cSTKNS6Di6zZY8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Fernando Fernandez Mancera , Joe Damato , Ido Schimmel , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 426/589] ipv6: fix possible UAF in icmpv6_rcv() Date: Sat, 30 May 2026 18:05:07 +0200 Message-ID: <20260530160235.922548777@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit f996edd7615e686ada141b7f3395025729ff8ccb ] Caching saddr and daddr before pskb_pull() is problematic since skb->head can change. Remove these temporary variables: - We only access &ipv6_hdr(skb)->saddr and &ipv6_hdr(skb)->daddr when net_dbg_ratelimited() is called in the slow path. - Avoid potential future misuse after pskb_pull() call. Fixes: 4b3418fba0fe ("ipv6: icmp: include addresses in debug messages") Signed-off-by: Eric Dumazet Reviewed-by: Fernando Fernandez Mancera Reviewed-by: Joe Damato Reviewed-by: Ido Schimmel Link: https://patch.msgid.link/20260416103505.2380753-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/icmp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 65846f4451894..35e99974aa882 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -867,7 +867,6 @@ static int icmpv6_rcv(struct sk_buff *skb) struct net *net = dev_net(skb->dev); struct net_device *dev = icmp6_dev(skb); struct inet6_dev *idev = __in6_dev_get(dev); - const struct in6_addr *saddr, *daddr; struct icmp6hdr *hdr; u8 type; bool success = false; @@ -894,12 +893,10 @@ static int icmpv6_rcv(struct sk_buff *skb) __ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INMSGS); - saddr = &ipv6_hdr(skb)->saddr; - daddr = &ipv6_hdr(skb)->daddr; - if (skb_checksum_validate(skb, IPPROTO_ICMPV6, ip6_compute_pseudo)) { net_dbg_ratelimited("ICMPv6 checksum failed [%pI6c > %pI6c]\n", - saddr, daddr); + &ipv6_hdr(skb)->saddr, + &ipv6_hdr(skb)->daddr); goto csum_error; } @@ -972,7 +969,8 @@ static int icmpv6_rcv(struct sk_buff *skb) break; net_dbg_ratelimited("icmpv6: msg of unknown type [%pI6c > %pI6c]\n", - saddr, daddr); + &ipv6_hdr(skb)->saddr, + &ipv6_hdr(skb)->daddr); /* * error of unknown type. -- 2.53.0