Commit 8044aad7 authored by Greg Ungerer's avatar Greg Ungerer

m68knommu: fix memcpy() out of bounds warning in get_user()

Newer versions of gcc are giving warnings in the non-MMU m68k version
of the get_user() macro:

    ./arch/m68k/include/asm/string.h:72:25: warning: ‘__builtin_memcpy’ forming offset [3, 4] is out of the bounds [0, 2] of object ‘__gu_val’ with type ‘short unsigned int’ [-Warray-bounds]

The warnings are generated when smaller sized variables are used as the
result of user space pointers to larger values. For example a
short/2-byte variable stores the result of a user space int (4-byte)
pointer. The warning is in the 8-byte branch of get_user() - even
though that branch is not the taken branch in the warning cases.

Refactor the 8-byte branch of get_user() so that it uses a correctly
formed union type to read and write the source and destination objects.
Keep using the memcpy() just in case the user space pointer is not
naturaly aligned (not required for ColdFire, but needed for early
68000).
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent d5fae240
...@@ -71,26 +71,29 @@ extern int __put_user_bad(void); ...@@ -71,26 +71,29 @@ extern int __put_user_bad(void);
#define get_user(x, ptr) \ #define get_user(x, ptr) \
({ \ ({ \
int __gu_err = 0; \ int __gu_err = 0; \
typeof(x) __gu_val = 0; \
switch (sizeof(*(ptr))) { \ switch (sizeof(*(ptr))) { \
case 1: \ case 1: \
__get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \ __get_user_asm(__gu_err, x, ptr, b, "=d"); \
break; \ break; \
case 2: \ case 2: \
__get_user_asm(__gu_err, __gu_val, ptr, w, "=r"); \ __get_user_asm(__gu_err, x, ptr, w, "=r"); \
break; \ break; \
case 4: \ case 4: \
__get_user_asm(__gu_err, __gu_val, ptr, l, "=r"); \ __get_user_asm(__gu_err, x, ptr, l, "=r"); \
break; \ break; \
case 8: \ case 8: { \
memcpy((void *) &__gu_val, ptr, sizeof (*(ptr))); \ union { \
u64 l; \
__typeof__(*(ptr)) t; \
} __gu_val; \
memcpy(&__gu_val.l, ptr, sizeof(__gu_val.l)); \
(x) = __gu_val.t; \
break; \ break; \
} \
default: \ default: \
__gu_val = 0; \
__gu_err = __get_user_bad(); \ __gu_err = __get_user_bad(); \
break; \ break; \
} \ } \
(x) = (typeof(*(ptr))) __gu_val; \
__gu_err; \ __gu_err; \
}) })
#define __get_user(x, ptr) get_user(x, ptr) #define __get_user(x, ptr) get_user(x, ptr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment