diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-24 01:55:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-24 01:55:48 +0100 |
| commit | d5500a074741b78b7f778b4ab3415d5ecdcda0a7 (patch) | |
| tree | 8f5a73bdc06bf198332f9ba50ddb136a2146e53f /lib | |
| parent | Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | usercopy: ARM NOMMU has no 64-bit get_user (diff) | |
| download | linux-d5500a074741b78b7f778b4ab3415d5ecdcda0a7.tar.xz linux-d5500a074741b78b7f778b4ab3415d5ecdcda0a7.zip | |
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
Diffstat (limited to 'lib')
| -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) && \ |