arm64: mm: fix thinko in non-global page table attribute check
PATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
The routine pgattr_change_is_safe() was extended in commit 4e6020565596 ("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.
--- arch/arm64/mm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/mm/mmu.c +4 -4
@@ -107,7 +107,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)* The following mapping attributes may be updated in live * kernel mappings without the need for break-before-make. */ -static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE ; +static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE |PTE_NG ;/* creating or taking down mappings is always safe */ if (old ==0 || new ==0 )
@@ -117,9 +117,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)if ((old | new) &PTE_CONT )return false; -/* Transitioning from Global to Non-Global is safe */ -if (((old ^ new) ==PTE_NG ) && (new &PTE_NG )) -return true; +/* Transitioning from Non-Global to Global is unsafe */ +if (old & ~new &PTE_NG ) +return false;return ((old ^ new) & ~mask) ==0 ; }
Signature · 1 line
2.11.0
PATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
(corrected Nicolas's email address - beware when replying)
Quoted 42 lines · Ard Biesheuvel
The routine
pgattr_change_is_safe()was extended in commit4e6020565596("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.Fixes 4e6020565596 ("arm64: mm: Permit transitioning from Global to ...")Signed-off-by Ard Biesheuvel <[email protected]>--- arch/arm64/mm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm64/mm/mmu.c +4
-5@@ -107,7 +107,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)* The following mapping attributes may be updated in live * kernel mappings without the need for break-before-make. */ -static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE ; +static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE |PTE_NG ;/* creating or taking down mappings is always safe */ if (old ==0 || new ==0 )@@ -117,9 +117,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)if ((old | new) &PTE_CONT )return false; -/* Transitioning from Global to Non-Global is safe */ -if (((old ^ new) ==PTE_NG ) && (new &PTE_NG )) -return true; +/* Transitioning from Non-Global to Global is unsafe */ +if (old & ~new &PTE_NG ) +return false;return ((old ^ new) & ~mask) ==0 ; } --2.11.0
Mark Rutland
reviewerPATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
In reply to Ard BiesheuvelQuoted 9 lines · Ard Biesheuvel
The routine
pgattr_change_is_safe()was extended in commit4e6020565596("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.Fixes 4e6020565596 ("arm64: mm: Permit transitioning from Global to ...")Signed-off-by Ard Biesheuvel <[email protected]>
FWIW:
Mark.
Quoted 33 lines
--- arch/arm64/mm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm64/mm/mmu.c +4
-4@@ -107,7 +107,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)* The following mapping attributes may be updated in live * kernel mappings without the need for break-before-make. */ -static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE ; +static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE |PTE_NG ;/* creating or taking down mappings is always safe */ if (old ==0 || new ==0 )@@ -117,9 +117,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)if ((old | new) &PTE_CONT )return false; -/* Transitioning from Global to Non-Global is safe */ -if (((old ^ new) ==PTE_NG ) && (new &PTE_NG )) -return true; +/* Transitioning from Non-Global to Global is unsafe */ +if (old & ~new &PTE_NG ) +return false;return ((old ^ new) & ~mask) ==0 ; }Signature · 1 line
2.11.0
PATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
In reply to Ard BiesheuvelQuoted 30 lines · Ard Biesheuvel
The routine
pgattr_change_is_safe()was extended in commit4e6020565596("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.Fixes 4e6020565596 ("arm64: mm: Permit transitioning from Global to ...")Signed-off-by Ard Biesheuvel <[email protected]>--- arch/arm64/mm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm64/mm/mmu.c +1
-1@@ -107,7 +107,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)* The following mapping attributes may be updated in live * kernel mappings without the need for break-before-make. */ -static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE ; +static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE |PTE_NG ;/* creating or taking down mappings is always safe */ if (old ==0 || new ==0 )@@ -117,9 +117,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)if ((old | new) &PTE_CONT )return false;
arch/arm64/mm/mmu.c static bool pgattr_change_is_safe(u64 old, u64 new) · line 125
Quoted 10 lines
arch/arm64/mm/mmu.c +3
-3-/* Transitioning from Global to Non-Global is safe */ -if (((old ^ new) ==PTE_NG ) && (new &PTE_NG )) -return true; +/* Transitioning from Non-Global to Global is unsafe */ +if (old & ~new &PTE_NG ) +return false;return ((old ^ new) & ~mask) ==0 ; }
Nice one.
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
PATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
In reply to Ard BiesheuvelQuoted 27 lines · Ard Biesheuvel
The routine
pgattr_change_is_safe()was extended in commit4e6020565596("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.Fixes 4e6020565596 ("arm64: mm: Permit transitioning from Global to ...")Signed-off-by Ard Biesheuvel <[email protected]>--- arch/arm64/mm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm64/mm/mmu.c +1
-1@@ -107,7 +107,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)* The following mapping attributes may be updated in live * kernel mappings without the need for break-before-make. */ -static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE ; +static const pteval_t mask =PTE_PXN |PTE_RDONLY |PTE_WRITE |PTE_NG ;/* creating or taking down mappings is always safe */ if (old ==0 || new ==0 )
arch/arm64/mm/mmu.c static bool pgattr_change_is_safe(u64 old, u64 new) · line 122
Quoted 9 lines
arch/arm64/mm/mmu.c +3
-3@@ -117,9 +117,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)if ((old | new) &PTE_CONT )return false; -/* Transitioning from Global to Non-Global is safe */ -if (((old ^ new) ==PTE_NG ) && (new &PTE_NG )) -return true; +/* Transitioning from Non-Global to Global is unsafe */ +if (old & ~new &PTE_NG ) +return false;
Oops, sorry about this:
Will
PATCH 1/1 arm64: mm: fix thinko in non-global page table attribute check
In reply to Ard BiesheuvelQuoted 9 lines · Ard Biesheuvel
The routine
pgattr_change_is_safe()was extended in commit4e6020565596("arm64: mm: Permit transitioning from Global to Non-Global without BBM") to permit changing the nG attribute from not set to set, but did so in a way that inadvertently disallows such changes if other permitted attribute changes take place at the same time. So update the code to take this into account.Fixes 4e6020565596 ("arm64: mm: Permit transitioning from Global to ...")Signed-off-by Ard Biesheuvel <[email protected]>
Queued for 4.16. Thanks.
Signature · 1 line
Catalin