diff options
| author | Al Viro | 2016-08-22 04:00:54 +0200 |
|---|---|---|
| committer | Al Viro | 2016-09-13 23:50:13 +0200 |
| commit | fd2d2b191fe75825c4c7a6f12f3fef35aaed7dd7 (patch) | |
| tree | 14746b37ca95bab956735d0d9cf270baf479bdb7 /arch/s390 | |
| parent | ppc32: fix copy_from_user() (diff) | |
| download | kernel-qcow2-linux-fd2d2b191fe75825c4c7a6f12f3fef35aaed7dd7.tar.gz kernel-qcow2-linux-fd2d2b191fe75825c4c7a6f12f3fef35aaed7dd7.tar.xz kernel-qcow2-linux-fd2d2b191fe75825c4c7a6f12f3fef35aaed7dd7.zip | |
s390: get_user() should zero on failure
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 9b49cf1daa8f..2c5d292ff752 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -266,28 +266,28 @@ int __put_user_bad(void) __attribute__((noreturn)); __chk_user_ptr(ptr); \ switch (sizeof(*(ptr))) { \ case 1: { \ - unsigned char __x; \ + unsigned char __x = 0; \ __gu_err = __get_user_fn(&__x, ptr, \ sizeof(*(ptr))); \ (x) = *(__force __typeof__(*(ptr)) *) &__x; \ break; \ }; \ case 2: { \ - unsigned short __x; \ + unsigned short __x = 0; \ __gu_err = __get_user_fn(&__x, ptr, \ sizeof(*(ptr))); \ (x) = *(__force __typeof__(*(ptr)) *) &__x; \ break; \ }; \ case 4: { \ - unsigned int __x; \ + unsigned int __x = 0; \ __gu_err = __get_user_fn(&__x, ptr, \ sizeof(*(ptr))); \ (x) = *(__force __typeof__(*(ptr)) *) &__x; \ break; \ }; \ case 8: { \ - unsigned long long __x; \ + unsigned long long __x = 0; \ __gu_err = __get_user_fn(&__x, ptr, \ sizeof(*(ptr))); \ (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |