Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 810e9f86 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/nohash: fix pte_access_permitted() 



Commit 5769beaf ("powerpc/mm: Add proper pte access check helper
for other platforms") replaced generic pte_access_permitted() by an
arch specific one.

The generic one is defined as
(pte_present(pte) && (!(write) || pte_write(pte)))

The arch specific one is open coded checking that _PAGE_USER and
_PAGE_WRITE (_PAGE_RW) flags are set, but lacking to check that
_PAGE_RO and _PAGE_PRIVILEGED are unset, leading to a useless test
on targets like the 8xx which defines _PAGE_RW and _PAGE_USER as 0.

Commit 5fa5b16b ("powerpc/mm/hugetlb: Use pte_access_permitted
for hugetlb access check") replaced some tests performed with
pte helpers by a call to pte_access_permitted(), leading to the same
issue.

This patch rewrites powerpc/nohash pte_access_permitted()
using pte helpers.

Fixes: 5769beaf ("powerpc/mm: Add proper pte access check helper for other platforms")
Fixes: 5fa5b16b ("powerpc/mm/hugetlb: Use pte_access_permitted for hugetlb access check")
Cc: stable@vger.kernel.org # v4.15+
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2ea62630

arch/powerpc/include/asm/nohash/pgtable.h

+3 −6
Original line number Diff line number Diff line
@@ -51,17 +51,14 @@ static inline int pte_present(pte_t pte) 
#define pte_access_permitted pte_access_permitted

static inline bool pte_access_permitted(pte_t pte, bool write)

{

	unsigned long pteval = pte_val(pte);

	/*

	 * A read-only access is controlled by _PAGE_USER bit.

	 * We have _PAGE_READ set for WRITE and EXECUTE

	 */

	unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER;



	if (write)

		need_pte_bits |= _PAGE_WRITE;

	if (!pte_present(pte) || !pte_user(pte) || !pte_read(pte))

		return false;



	if ((pteval & need_pte_bits) != need_pte_bits)

	if (write && !pte_write(pte))

		return false;



	return true;