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

Commit 3625c2c2 authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

x86/mm: Fix types used in pgprot cacheability flags translations 



For PAE kernels "unsigned long" is not suitable to hold page protection
flags, since _PAGE_NX doesn't fit there. This is the reason for quite a
few W+X pages getting reported as insecure during boot (observed namely
for the entire initrd range).

Fixes: 281d4078 ("x86: Make page cache mode a real type")
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <JGross@suse.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/56A7635602000078000CAFF1@prv-mh.provo.novell.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 22c43f36

arch/x86/include/asm/pgtable_types.h

+2 −4
Original line number Diff line number Diff line
@@ -363,20 +363,18 @@ static inline enum page_cache_mode pgprot2cachemode(pgprot_t pgprot) 
}

static inline pgprot_t pgprot_4k_2_large(pgprot_t pgprot)

{

	pgprotval_t val = pgprot_val(pgprot);

	pgprot_t new;

	unsigned long val;



	val = pgprot_val(pgprot);

	pgprot_val(new) = (val & ~(_PAGE_PAT | _PAGE_PAT_LARGE)) |

		((val & _PAGE_PAT) << (_PAGE_BIT_PAT_LARGE - _PAGE_BIT_PAT));

	return new;

}

static inline pgprot_t pgprot_large_2_4k(pgprot_t pgprot)

{

	pgprotval_t val = pgprot_val(pgprot);

	pgprot_t new;

	unsigned long val;



	val = pgprot_val(pgprot);

	pgprot_val(new) = (val & ~(_PAGE_PAT | _PAGE_PAT_LARGE)) |

			  ((val & _PAGE_PAT_LARGE) >>

			   (_PAGE_BIT_PAT_LARGE - _PAGE_BIT_PAT));