Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

d5500a07 · Linus Torvalds <[email protected]> · 2017-02-23 16:55:48 -08:00

Pull usercopy test fix from Kees Cook:
 "Fix for non-MMU ARM testing, from Arnd Bergmann"

* tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  usercopy: ARM NOMMU has no 64-bit get_user

Commit: d5500a074741b78b7f778b4ab3415d5ecdcda0a7
Parents: b2e3c431 · 4deaa6fd

Merge commit. Changes below are compared with the first parent: b2e3c431.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
lib/test_user_copy.c	modified	+2	−1	View file

lib/test_user_copy.c

View file

diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c
index 6f335a3..1a8d71a 100644
--- a/lib/test_user_copy.c
+++ b/lib/test_user_copy.c
@@ -30,7 +30,8 @@
  * As there doesn't appear to be anything that can safely determine
  * their capability at compile-time, we just have to opt-out certain archs.
  */
-#if BITS_PER_LONG == 64 || (!defined(CONFIG_AVR32)  &&		\
+#if BITS_PER_LONG == 64 || (!(defined(CONFIG_ARM) && !defined(MMU)) && \
+			    !defined(CONFIG_AVR32) &&		\
 			    !defined(CONFIG_BLACKFIN) &&	\
 			    !defined(CONFIG_M32R) &&		\
 			    !defined(CONFIG_M68K) &&		\