Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9409227a 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 Catalin Marinas:

 - kasan: avoid pfn_to_nid() before the page array is initialised

 - Fix typo causing the "upgrade" of known signals to SIGKILL

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: signal: don't force known signals to SIGKILL
  arm64: kasan: avoid pfn_to_nid() before page array is initialized
parents 7a752478 b2d71b3c

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ void force_signal_inject(int signal, int code, unsigned long address) 
	}



	/* Force signals we don't understand to SIGKILL */

	if (WARN_ON(signal != SIGKILL ||

	if (WARN_ON(signal != SIGKILL &&

		    siginfo_layout(signal, code) != SIL_FAULT)) {

		signal = SIGKILL;

	}

arch/arm64/mm/kasan_init.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ void __init kasan_init(void) 
	clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);



	kasan_map_populate(kimg_shadow_start, kimg_shadow_end,

			   pfn_to_nid(virt_to_pfn(lm_alias(_text))));

			   early_pfn_to_nid(virt_to_pfn(lm_alias(_text))));



	kasan_populate_zero_shadow((void *)KASAN_SHADOW_START,

				   (void *)mod_shadow_start);
@@ -224,7 +224,7 @@ void __init kasan_init(void) 


		kasan_map_populate((unsigned long)kasan_mem_to_shadow(start),

				   (unsigned long)kasan_mem_to_shadow(end),

				   pfn_to_nid(virt_to_pfn(start)));

				   early_pfn_to_nid(virt_to_pfn(start)));

	}



	/*