diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 16:55:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 16:55:48 -0800 |
| commit | d5500a074741b78b7f778b4ab3415d5ecdcda0a7 (patch) | |
| tree | 8f5a73bdc06bf198332f9ba50ddb136a2146e53f | |
| parent | b2e3c4319d40c9055c3c587cdb82ba69b50e919d (diff) | |
| parent | 4deaa6fd00be2bf408dd06cdf0c40a1b59237879 (diff) | |
Merge tag 'usercopy-v4.11-rc1.fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
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
| -rw-r--r-- | lib/test_user_copy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c index 6f335a3d4ae2..1a8d71a68531 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) && \ |