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

Commit e1f02037 authored by Russell King's avatar Russell King
Browse files

Merge branch 'security-fixes' into fixes

parents 4f9b4fb7 ac124504

arch/arm/kernel/fiq.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ void set_fiq_handler(void *start, unsigned int length) 


	memcpy(base + offset, start, length);

	if (!cache_is_vipt_nonaliasing())

		flush_icache_range(base + offset, offset + length);

		flush_icache_range((unsigned long)base + offset, offset +

				   length);

	flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);

}

arch/arm/mm/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -809,15 +809,18 @@ config KUSER_HELPERS 
	  the CPU type fitted to the system.  This permits binaries to be

	  run on ARMv4 through to ARMv7 without modification.



	  See Documentation/arm/kernel_user_helpers.txt for details.



	  However, the fixed address nature of these helpers can be used

	  by ROP (return orientated programming) authors when creating

	  exploits.



	  If all of the binaries and libraries which run on your platform

	  are built specifically for your platform, and make no use of

	  these helpers, then you can turn this option off.  However,

	  when such an binary or library is run, it will receive a SIGILL

	  signal, which will terminate the program.

	  these helpers, then you can turn this option off to hinder

	  such exploits. However, in that case, if a binary or library

	  relying on those helpers is run, it will receive a SIGILL signal,

	  which will terminate the program.



	  Say N here only if you are absolutely certain that you do not

	  need these helpers; otherwise, the safe option is to say Y.