diff options
| author | Helge Deller <deller@gmx.de> | 2018-10-12 23:37:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 11:27:30 +0300 |
| commit | ae53e64ea305d278857d31ea2d20dcad7a6ac929 (patch) | |
| tree | 0fa0492afdd5c7822a64a5efba5b3e1739a7f800 | |
| parent | 7d39307dd6dad9b4a345bb121aae061f91a0dce1 (diff) | |
| download | linux-ae53e64ea305d278857d31ea2d20dcad7a6ac929.tar.xz | |
parisc: Fix map_pages() to not overwrite existing pte entries
commit 3c229b3f2dd8133f61bb81d3cb018be92f4bba39 upstream.
Fix a long-existing small nasty bug in the map_pages() implementation which
leads to overwriting already written pte entries with zero, *if* map_pages() is
called a second time with an end address which isn't aligned on a pmd boundry.
This happens for example if we want to remap only the text segment read/write
in order to run alternative patching on the code. Exiting the loop when we
reach the end address fixes this.
Cc: stable@vger.kernel.org
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/parisc/mm/init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 1b366c477687..63741f2e8d01 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -491,12 +491,8 @@ static void __init map_pages(unsigned long start_vaddr, pte = pte_mkhuge(pte); } - if (address >= end_paddr) { - if (force) - break; - else - pte_val(pte) = 0; - } + if (address >= end_paddr) + break; set_pte(pg_table, pte); |