Commit 299a7653 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] Fix PA-RISC put_user

Some put_user() callers mismatch the type of the object and the pointer.
Since PA-RISC is big-endian, the wrong bits were being copied to userspace.
Signed-off-by: default avatarRandolph Chung <tausq@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4305dde5
...@@ -149,22 +149,23 @@ struct exception_data { ...@@ -149,22 +149,23 @@ struct exception_data {
#define __put_user(x,ptr) \ #define __put_user(x,ptr) \
({ \ ({ \
register long __pu_err __asm__ ("r8") = 0; \ register long __pu_err __asm__ ("r8") = 0; \
__typeof__(*(ptr)) __x = (__typeof__(*(ptr)))(x); \
\ \
if (segment_eq(get_fs(),KERNEL_DS)) { \ if (segment_eq(get_fs(),KERNEL_DS)) { \
switch (sizeof(*(ptr))) { \ switch (sizeof(*(ptr))) { \
case 1: __put_kernel_asm("stb",x,ptr); break; \ case 1: __put_kernel_asm("stb",__x,ptr); break; \
case 2: __put_kernel_asm("sth",x,ptr); break; \ case 2: __put_kernel_asm("sth",__x,ptr); break; \
case 4: __put_kernel_asm("stw",x,ptr); break; \ case 4: __put_kernel_asm("stw",__x,ptr); break; \
case 8: STD_KERNEL(x,ptr); break; \ case 8: STD_KERNEL(__x,ptr); break; \
default: __put_kernel_bad(); break; \ default: __put_kernel_bad(); break; \
} \ } \
} \ } \
else { \ else { \
switch (sizeof(*(ptr))) { \ switch (sizeof(*(ptr))) { \
case 1: __put_user_asm("stb",x,ptr); break; \ case 1: __put_user_asm("stb",__x,ptr); break; \
case 2: __put_user_asm("sth",x,ptr); break; \ case 2: __put_user_asm("sth",__x,ptr); break; \
case 4: __put_user_asm("stw",x,ptr); break; \ case 4: __put_user_asm("stw",__x,ptr); break; \
case 8: STD_USER(x,ptr); break; \ case 8: STD_USER(__x,ptr); break; \
default: __put_user_bad(); break; \ default: __put_user_bad(); break; \
} \ } \
} \ } \
......
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