diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-22 01:40:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 04:41:18 -0400 |
commit | c2e3277f875b83e5adc34e96989d6d87ec5f80f7 (patch) | |
tree | c25f6dd50e136d720f8f35d689946b6d256d054b /arch/x86 | |
parent | 988781dc3e1d9209192b04458d279815923f5e76 (diff) |
x86: fix pte_flags() to only return flags, fix lguest (updated)
(Jeremy said:
rusty: use PTE_MASK
rusty: use PTE_MASK
rusty: use PTE_MASK
When I asked:
jsgf: does that include the NX flag?
He responded eloquently:
rusty: use PTE_MASK
rusty: use PTE_MASK
yes, it's the official constant of masking flags out of ptes
)
Change a15af1c9ea2750a9ff01e51615c45950bad8221b 'x86/paravirt: add
pte_flags to just get pte flags' removed lguest's private pte_flags()
in favor of a generic one.
Unfortunately, the generic one doesn't filter out the non-flags bits:
this results in lguest creating corrupt shadow page tables and blowing
up host memory.
Since noone is supposed to use the pfn part of pte_flags(), it seems
safest to always do the filtering.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-and-morning-tea-spilled-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 097d8a6797fa..94da4d52d798 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -443,7 +443,7 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
443 | #endif /* PAGETABLE_LEVELS >= 3 */ | 443 | #endif /* PAGETABLE_LEVELS >= 3 */ |
444 | 444 | ||
445 | .pte_val = native_pte_val, | 445 | .pte_val = native_pte_val, |
446 | .pte_flags = native_pte_val, | 446 | .pte_flags = native_pte_flags, |
447 | .pgd_val = native_pgd_val, | 447 | .pgd_val = native_pgd_val, |
448 | 448 | ||
449 | .make_pte = native_make_pte, | 449 | .make_pte = native_make_pte, |