tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
"This round of fixes is smaller than previous: a couple more updates
for the security fixes, and a one-liner kexec fix"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7816/1: CONFIG_KUSER_HELPERS: fix help text
ARM: 7815/1: kexec: offline non panic CPUs on Kdump panic
ARM: 7819/1: fiq: Cast the first argument of flush_icache_range()

Linus Torvalds 1b4757ee 4d4323ea

+9 -4
+2 -1
arch/arm/kernel/fiq.c
··· 89 89 90 90 memcpy(base + offset, start, length); 91 91 if (!cache_is_vipt_nonaliasing()) 92 - flush_icache_range(base + offset, offset + length); 92 + flush_icache_range((unsigned long)base + offset, offset + 93 + length); 93 94 flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length); 94 95 } 95 96
+1
arch/arm/kernel/machine_kexec.c
··· 82 82 crash_save_cpu(&regs, smp_processor_id()); 83 83 flush_cache_all(); 84 84 85 + set_cpu_online(smp_processor_id(), false); 85 86 atomic_dec(&waiting_for_crash_ipi); 86 87 while (1) 87 88 cpu_relax();
+6 -3
arch/arm/mm/Kconfig
··· 809 809 the CPU type fitted to the system. This permits binaries to be 810 810 run on ARMv4 through to ARMv7 without modification. 811 811 812 + See Documentation/arm/kernel_user_helpers.txt for details. 813 + 812 814 However, the fixed address nature of these helpers can be used 813 815 by ROP (return orientated programming) authors when creating 814 816 exploits. 815 817 816 818 If all of the binaries and libraries which run on your platform 817 819 are built specifically for your platform, and make no use of 818 - these helpers, then you can turn this option off. However, 819 - when such an binary or library is run, it will receive a SIGILL 820 - signal, which will terminate the program. 820 + these helpers, then you can turn this option off to hinder 821 + such exploits. However, in that case, if a binary or library 822 + relying on those helpers is run, it will receive a SIGILL signal, 823 + which will terminate the program. 821 824 822 825 Say N here only if you are absolutely certain that you do not 823 826 need these helpers; otherwise, the safe option is to say Y.