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 4829E51E45E for ; Thu, 10 Sep 2026 16:44:50 +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=1789058693; cv=none; b=Xtq6asnNjKOTqxavH+8rGiDzjm36bfgoQq424BNUj+m6Bcdm+cSXmgtirS+jClT4OpwwzhwFl1fKITvwR4kOY36juKEI0ctby67jwuhGzRZcl+VuJTzsj0EcXuGZv+4EShP4cp298VC3B9OGn+EcNcQg4nZ57ReorZ73OSnRby4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789058693; c=relaxed/simple; bh=zD3WG+1uNK0B3jt0MeRoQj7HGbLvEUDV56yIIGlytv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u8Rk80PZpw5kvXJYZZYe2VQ6+AYzdhYxa2F1EbMJS13fBwfGLkSNA3nC6Zb5eIx8iEE4g+5YBcGLDEwxDnbnPpoUVm6A+NceVdCWE8prEBk5o47RqRUxx/D//ZJ/tequFS9dCv+SzJbfFslD/agbsMWvXMZxZoqx/r/7XQ8Cmcg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GmpgWvBN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GmpgWvBN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1889F1F000FF; Thu, 10 Sep 2026 16:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789058689; bh=SEmZo4+GdcLeZ9/pg2DoPp/ERxnpWlYlayKrCzyP92A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GmpgWvBNQbzG7oMsGHGZBAaGn4NFh4WD9TjVX2iiEwWfvnVhh962kpJK3/Wl1DU0f W6zDgdhyqvok71Td1mtQCi5ktfDWc0TXCg+zYkG/M8mebFadkUizCm2yC86Pne6tGz vH3F8t6CQqvXmGsiKXR/FTdjFddvKa73gMuziLqsWLPY8gEunrNnM5dU+YMKDL42hP 3SS2Pi701i/0bHuCOKBcQF2kP2NAgdaTO8B/g4uIzXzsSTLFzoFECm3yHu4owUjR1I l2vo+sjDtVY0f+PsE2SeOwxvFRVRN6NsxnGcFh53Pe9jPyjOFReCkIZ3NxaWxNLJiT TasQ1tXPl1cuw== From: Sasha Levin To: stable@vger.kernel.org Cc: Hugh Dickins , Catalin Marinas , Alexander Gordeev , Alexandre Ghiti , "Aneesh Kumar K.V" , Christian Borntraeger , Chris Zankel , Claudio Imbrenda , David Hildenbrand , "David S. Miller" , Geert Uytterhoeven , Greg Ungerer , Heiko Carstens , Helge Deller , "H. Peter Anvin" , Ingo Molnar , John David Anglin , John Paul Adrian Glaubitz , "Kirill A. Shutemov" , "Matthew Wilcox (Oracle)" , Max Filippov , Michael Ellerman , Michal Simek , Mike Kravetz , "Mike Rapoport (IBM)" , Palmer Dabbelt , Peter Zijlstra , Qi Zheng , Russell King , Suren Baghdasaryan , Thomas Bogendoerfer , Thomas Gleixner , Will Deacon , Andrew Morton , Sasha Levin Subject: [PATCH 6.1.y 1/2] arm64: allow pte_offset_map() to fail Date: Thu, 10 Sep 2026 12:44:43 -0400 Message-ID: <20260910164444.1248701-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090940-catering-debug-33e5@gregkh> References: <2026090940-catering-debug-33e5@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hugh Dickins [ Upstream commit 52924726f4c06b3f77de75fb665e6efd8e777d07 ] In rare transient cases, not yet made possible, pte_offset_map() and pte_offset_map_lock() may not find a page table: handle appropriately. Link: https://lkml.kernel.org/r/35e46485-8499-4337-c51f-b8fa495a1a93@google.com Signed-off-by: Hugh Dickins Acked-by: Catalin Marinas Cc: Alexander Gordeev Cc: Alexandre Ghiti Cc: Aneesh Kumar K.V Cc: Christian Borntraeger Cc: Chris Zankel Cc: Claudio Imbrenda Cc: David Hildenbrand Cc: "David S. Miller" Cc: Geert Uytterhoeven Cc: Greg Ungerer Cc: Heiko Carstens Cc: Helge Deller Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: John David Anglin Cc: John Paul Adrian Glaubitz Cc: Kirill A. Shutemov Cc: Matthew Wilcox (Oracle) Cc: Max Filippov Cc: Michael Ellerman Cc: Michal Simek Cc: Mike Kravetz Cc: Mike Rapoport (IBM) Cc: Palmer Dabbelt Cc: Peter Zijlstra Cc: Qi Zheng Cc: Russell King Cc: Suren Baghdasaryan Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Andrew Morton Stable-dep-of: a77644d009de ("arm64: mm: Fix the lockless page-table walk in show_pte()") Signed-off-by: Sasha Levin --- arch/arm64/mm/fault.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 0776c98ad27f1..c4120bd80a9b4 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -177,6 +177,9 @@ static void show_pte(unsigned long addr) break; ptep = pte_offset_map(pmdp, addr); + if (!ptep) + break; + pte = READ_ONCE(*ptep); pr_cont(", pte=%016llx", pte_val(pte)); pte_unmap(ptep); -- 2.53.0