Commit 8b050fe4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "Although we're still debugging a few minor arm64-specific issues in
  mainline, I didn't want to hold this lot up in the meantime.

  We've got an additional KASLR fix after the previous one wasn't quite
  complete, a fix for a performance regression when mapping executable
  pages into userspace and some fixes for kprobe blacklisting. All
  candidates for stable.

  Summary:

   - Fix module loading when KASLR is configured but disabled at runtime

   - Fix accidental IPI when mapping user executable pages

   - Ensure hyp-stub and KVM world switch code cannot be kprobed"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: hibernate: Clean the __hyp_text to PoC after resume
  arm64: hyp-stub: Forbid kprobing of the hyp-stub
  arm64: kprobe: Always blacklist the KVM world-switch code
  arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
  arm64: Do not issue IPIs for user executable ptes
parents 33640d71 f7daa9c8

arch/arm64/kernel/hibernate.c

+3 −1
Original line number Diff line number Diff line
@@ -299,8 +299,10 @@ int swsusp_arch_suspend(void) 
		dcache_clean_range(__idmap_text_start, __idmap_text_end);



		/* Clean kvm setup code to PoC? */

		if (el2_reset_needed())

		if (el2_reset_needed()) {

			dcache_clean_range(__hyp_idmap_text_start, __hyp_idmap_text_end);

			dcache_clean_range(__hyp_text_start, __hyp_text_end);

		}



		/* make the crash dump kernel image protected again */

		crash_post_resume();

arch/arm64/kernel/hyp-stub.S

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <asm/virt.h>



	.text

	.pushsection	.hyp.text, "ax"



	.align 11



ENTRY(__hyp_stub_vectors)

arch/arm64/kernel/kaslr.c

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys) 
	 * we end up running with module randomization disabled.

	 */

	module_alloc_base = (u64)_etext - MODULES_VSIZE;

	__flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));



	/*

	 * Try to map the FDT early. If this fails, we simply bail,

arch/arm64/kernel/probes/kprobes.c

+3 −3
Original line number Diff line number Diff line
@@ -478,13 +478,13 @@ bool arch_within_kprobe_blacklist(unsigned long addr) 
	    addr < (unsigned long)__entry_text_end) ||

	    (addr >= (unsigned long)__idmap_text_start &&

	    addr < (unsigned long)__idmap_text_end) ||

	    (addr >= (unsigned long)__hyp_text_start &&

	    addr < (unsigned long)__hyp_text_end) ||

	    !!search_exception_tables(addr))

		return true;



	if (!is_kernel_in_hyp_mode()) {

		if ((addr >= (unsigned long)__hyp_text_start &&

		    addr < (unsigned long)__hyp_text_end) ||

		    (addr >= (unsigned long)__hyp_idmap_text_start &&

		if ((addr >= (unsigned long)__hyp_idmap_text_start &&

		    addr < (unsigned long)__hyp_idmap_text_end))

			return true;

	}

arch/arm64/mm/flush.c

+5 −1
Original line number Diff line number Diff line
@@ -33,7 +33,11 @@ void sync_icache_aliases(void *kaddr, unsigned long len) 
		__clean_dcache_area_pou(kaddr, len);

		__flush_icache_all();

	} else {

		flush_icache_range(addr, addr + len);

		/*

		 * Don't issue kick_all_cpus_sync() after I-cache invalidation

		 * for user mappings.

		 */

		__flush_icache_range(addr, addr + len);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE