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 941CD19E7F9; Mon, 23 Jun 2025 22:16:17 +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=1750716979; cv=none; b=Pz1F7u4LZaL1yEvIrEGnz0B+hJWAbhE93nViES36gW0AAOI1+wQZgz0S6Mkfcdc1hE5+kUwKU8kdVlnCTkRofpLtuy8OS/gwwRQFWlFM/M0Nl7yZhLFo8Y3T6pvqS07yb4zytMG61DCOACd1On8mj0s3Pa2hzLlyOuC6gULu77E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716979; c=relaxed/simple; bh=tybIgB0bxNWxUDsUHrYA0BaOvqjZbGNcW3vL9qfpnAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nxCpw5fs5uJF12UALCwUkjJV6n2nNo8f55Jj8tYlJaJFRGE0KlZqpYCRYjlSwRm61qbqUuVXFVYuQK9XG7r4v4OlfbJ9LUTVVsGpozYEjqpjgUht4gj6/FsYbK6xt2vtsvc2dl6HSowrAFKn2AwYXbVKOGbgNa/KjGOcmX0I/tQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XUyQsyDw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XUyQsyDw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2FB1C4CEEA; Mon, 23 Jun 2025 22:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716977; bh=tybIgB0bxNWxUDsUHrYA0BaOvqjZbGNcW3vL9qfpnAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XUyQsyDwfOil2oOFIJno5v9jmYbHlT6xr4KJI9Ia8SGbyelHsmiPXsBdwbMPmgj97 RwI6xS/lYEPmBmY/livhMZFg7wlo8BIsTutrf+VT5CmD/VXE+jr230gnn3eSchBNO1 K4u6KSCNki5/QjsoRRAur4W8HGmnBdoR8x9P2EFk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tianyang Zhang , Huacai Chen Subject: [PATCH 6.12 303/414] LoongArch: Fix panic caused by NULL-PMD in huge_pte_offset() Date: Mon, 23 Jun 2025 15:07:20 +0200 Message-ID: <20250623130649.578506451@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tianyang Zhang commit ee084fa96123ede8b0563a1b5a9b23adc43cd50d upstream. ERROR INFO: CPU 25 Unable to handle kernel paging request at virtual address 0x0 ... Call Trace: [<900000000023c30c>] huge_pte_offset+0x3c/0x58 [<900000000057fd4c>] hugetlb_follow_page_mask+0x74/0x438 [<900000000051fee8>] __get_user_pages+0xe0/0x4c8 [<9000000000522414>] faultin_page_range+0x84/0x380 [<9000000000564e8c>] madvise_vma_behavior+0x534/0xa48 [<900000000056689c>] do_madvise+0x1bc/0x3e8 [<9000000000566df4>] sys_madvise+0x24/0x38 [<90000000015b9e88>] do_syscall+0x78/0x98 [<9000000000221f18>] handle_syscall+0xb8/0x158 In some cases, pmd may be NULL and rely on NULL as the return value for processing, so it is necessary to determine this situation here. Cc: stable@vger.kernel.org Fixes: bd51834d1cf6 ("LoongArch: Return NULL from huge_pte_offset() for invalid PMD") Signed-off-by: Tianyang Zhang Signed-off-by: Huacai Chen Signed-off-by: Greg Kroah-Hartman --- arch/loongarch/mm/hugetlbpage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/loongarch/mm/hugetlbpage.c +++ b/arch/loongarch/mm/hugetlbpage.c @@ -47,7 +47,8 @@ pte_t *huge_pte_offset(struct mm_struct pmd = pmd_offset(pud, addr); } } - return pmd_none(pmdp_get(pmd)) ? NULL : (pte_t *) pmd; + + return (!pmd || pmd_none(pmdp_get(pmd))) ? NULL : (pte_t *) pmd; } uint64_t pmd_to_entrylo(unsigned long pmd_val)