linux-kernel - [V2] riscv: fix pfn_to_virt err in do_page

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1600419358-21446-1-git-send-email-liush@allwinnertech.com>
Date:   Fri, 18 Sep 2020 16:55:58 +0800
From:   liush <liush@...winnertech.com>
To:     paul.walmsley@...ive.com, palmer@...belt.com,
        aou@...s.berkeley.edu, akpm@...ux-foundation.org,
        peterx@...hat.com, daniel.m.jordan@...cle.com, walken@...gle.com,
        vbabka@...e.cz, rppt@...nel.org
Cc:     linux-riscv@...ts.infradead.org, linux-kernel@...r.kernel.org,
        liush <liush@...winnertech.com>
Subject: [V2] riscv: fix pfn_to_virt err in do_page_fault().

The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.

Signed-off-by: liush <liush@...winnertech.com>
---
 arch/riscv/mm/fault.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index 716d64e..3e560ec13 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -198,6 +198,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		pmd_t *pmd, *pmd_k;
 		pte_t *pte_k;
 		int index;
+		unsigned long pfn;
 
 		/* User mode accesses just cause a SIGSEGV */
 		if (user_mode(regs))
@@ -212,7 +213,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
 		 * of a task switch.
 		 */
 		index = pgd_index(addr);
-		pgd = (pgd_t *)pfn_to_virt(csr_read(CSR_SATP)) + index;
+		pfn = csr_read(CSR_SATP) & SATP_PPN;
+		pgd = (pgd_t *)pfn_to_virt(pfn) + index;
 		pgd_k = init_mm.pgd + index;
 
 		if (!pgd_present(*pgd_k))
-- 
2.7.4