UBUNTU: SAUCE: arm64: __idmap_cpu_set_reserved_ttbr1: fix !ARM64_PA_BITS_52 logic

Signed-off-by: dann frazier <dann.frazier@canonical.com>
CVE-2017-5753
CVE-2017-5715
CVE-2017-5754

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 27058f3fd1320d9141604e97e46a9d814c604046..87f03fcdf3c52dae4a4c3b4e2fe2231baa4b7a95 100644 (file)
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -153,9 +153,9 @@ ENDPROC(cpu_do_switch_mm)
 
        .pushsection ".idmap.text", "awx"
 
-.macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2
+.macro __idmap_cpu_set_reserved_ttbr1, tmp1
        adrp    \tmp1, empty_zero_page
-       msr     ttbr1_el1, \tmp2
+       msr     ttbr1_el1, \tmp1
        isb
        tlbi    vmalle1
        dsb     nsh
@@ -172,7 +172,7 @@ ENTRY(idmap_cpu_replace_ttbr1)
        mrs     x2, daif
        msr     daifset, #0xf
 
-       __idmap_cpu_set_reserved_ttbr1 x1, x3
+       __idmap_cpu_set_reserved_ttbr1 x1
 
        msr     ttbr1_el1, x0
        isb
@@ -326,7 +326,7 @@ next_pte:
        /* Secondary CPUs end up here */
 __idmap_kpti_secondary:
        /* Uninstall swapper before surgery begins */
-       __idmap_cpu_set_reserved_ttbr1 x18, x17
+       __idmap_cpu_set_reserved_ttbr1 x18
 
        /* Increment the flag to let the boot CPU we're ready */
 1:     ldxr    w18, [flag_ptr]