diff options
| author | Tkhai Kirill <tkhai@yandex.ru> | 2011-03-14 13:27:46 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-03-14 14:44:30 +0000 |
| commit | 6fc34436be2494c6fea63dc0759be9b360d9480a (patch) | |
| tree | c084e9bc8ed456e504efb01ae180d9b7f02fb009 /arch/mn10300 | |
| parent | c44ed965be7a84afaa07543c04eb97a5dfe93422 (diff) | |
| download | linux-stable-6fc34436be2494c6fea63dc0759be9b360d9480a.tar.gz linux-stable-6fc34436be2494c6fea63dc0759be9b360d9480a.tar.bz2 linux-stable-6fc34436be2494c6fea63dc0759be9b360d9480a.zip | |
MN10300: Proper use of macros get_user() in the case of incremented pointers
Using __get_user_check(x, ptr++, size) leads to double increment of pointer.
This macro uses the macro get_user directly, which itself is used in this way
(get_user(x, ptr++)) in some functions of the kernel. The patch fixes the
error.
Reported-by: Tkhai Kirill <tkhai@yandex.ru>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/include/asm/uaccess.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mn10300/include/asm/uaccess.h b/arch/mn10300/include/asm/uaccess.h index 679dee0bbd08..3d6e60dad9d9 100644 --- a/arch/mn10300/include/asm/uaccess.h +++ b/arch/mn10300/include/asm/uaccess.h @@ -160,9 +160,10 @@ struct __large_struct { unsigned long buf[100]; }; #define __get_user_check(x, ptr, size) \ ({ \ + const __typeof__(ptr) __guc_ptr = (ptr); \ int _e; \ - if (likely(__access_ok((unsigned long) (ptr), (size)))) \ - _e = __get_user_nocheck((x), (ptr), (size)); \ + if (likely(__access_ok((unsigned long) __guc_ptr, (size)))) \ + _e = __get_user_nocheck((x), __guc_ptr, (size)); \ else { \ _e = -EFAULT; \ (x) = (__typeof__(x))0; \ |