linux-kernel - Re: [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-prev] [day] [month] [year] [list]

Message-ID: <mhng-6b275467-464f-45b7-9ada-7c86add704f6@palmerdabbelt-glaptop1>
Date:   Sat, 26 Sep 2020 17:35:28 -0700 (PDT)
From:   Palmer Dabbelt <palmer@...belt.com>
To:     liush@...winnertech.com
CC:     Paul Walmsley <paul.walmsley@...ive.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, linux-riscv@...ts.infradead.org,
        linux-kernel@...r.kernel.org, liush@...winnertech.com
Subject:     Re: [V2] riscv: fix pfn_to_virt err in do_page_fault().

On Fri, 18 Sep 2020 01:55:58 PDT (-0700), liush@...winnertech.com wrote:
> The argument to pfn_to_virt() should be pfn not the value of CSR_SATP.

Reviewed-by: Palmer Dabbelt <palmerdabbelt@...gle.com>

> Signed-off-by: liush <liush@...winnertech.com>

IIUC you're supposed to use an actual name.

> ---
>  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))