Commit 864aa04cd02979c2c755cb28b5f4fe56039171c0

Authored by Will Deacon
1 parent 3d70f8c617

ARM: mm: use pteval_t to represent page protection values

When updating the page protection map after calculating the user_pgprot
value, the base protection map is temporarily stored in an unsigned long
type, causing truncation of the protection bits when LPAE is enabled.
This effectively means that calls to mprotect() will corrupt the upper
page attributes, clearing the XN bit unconditionally.

This patch uses pteval_t to store the intermediate protection values,
preserving the upper bits for 64-bit descriptors.

Cc: stable@vger.kernel.org
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -488,7 +488,7 @@
488 488 #endif
489 489  
490 490 for (i = 0; i < 16; i++) {
491   - unsigned long v = pgprot_val(protection_map[i]);
  491 + pteval_t v = pgprot_val(protection_map[i]);
492 492 protection_map[i] = __pgprot(v | user_pgprot);
493 493 }
494 494