Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218540
b: refs/heads/master
c: eb5a369
h: refs/heads/master
v: v3
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed Oct 28, 2010
1 parent eaa77c8 commit 0f1e007
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b05a69e0534ec70bc94921936ffa05b330507cb
refs/heads/master: eb5a3699311ba8ed22b7b38ceb3bb1411e438e2a
10 changes: 4 additions & 6 deletions trunk/arch/x86/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long tmp;

ret = -EIO;
if ((addr & (sizeof(data) - 1)) || addr < 0 ||
addr >= sizeof(struct user))
if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user))
break;

tmp = 0; /* Default return condition */
Expand All @@ -831,8 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,

case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO;
if ((addr & (sizeof(data) - 1)) || addr < 0 ||
addr >= sizeof(struct user))
if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user))
break;

if (addr < sizeof(struct user_regs_struct))
Expand Down Expand Up @@ -892,14 +890,14 @@ long arch_ptrace(struct task_struct *child, long request,
if ((int) addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
(struct user_desc __user *) data);
(struct user_desc __user *)data);
break;

case PTRACE_SET_THREAD_AREA:
if ((int) addr < 0)
return -EIO;
ret = do_set_thread_area(child, addr,
(struct user_desc __user *) data, 0);
(struct user_desc __user *)data, 0);
break;
#endif

Expand Down

0 comments on commit 0f1e007

Please sign in to comment.