projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-5.7' of git://git.linux-nfs.org/projects/cel/cel-2.6
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
stacktrace.c
diff --git
a/arch/x86/kernel/stacktrace.c
b/arch/x86/kernel/stacktrace.c
index
2d6898c
..
6ad43fc
100644
(file)
--- a/
arch/x86/kernel/stacktrace.c
+++ b/
arch/x86/kernel/stacktrace.c
@@
-96,7
+96,8
@@
struct stack_frame_user {
};
static int
};
static int
-copy_stack_frame(const void __user *fp, struct stack_frame_user *frame)
+copy_stack_frame(const struct stack_frame_user __user *fp,
+ struct stack_frame_user *frame)
{
int ret;
{
int ret;
@@
-105,7
+106,8
@@
copy_stack_frame(const void __user *fp, struct stack_frame_user *frame)
ret = 1;
pagefault_disable();
ret = 1;
pagefault_disable();
- if (__copy_from_user_inatomic(frame, fp, sizeof(*frame)))
+ if (__get_user(frame->next_fp, &fp->next_fp) ||
+ __get_user(frame->ret_addr, &fp->ret_addr))
ret = 0;
pagefault_enable();
ret = 0;
pagefault_enable();