git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
ptrace.c
diff --git
a/arch/x86/kernel/ptrace.c
b/arch/x86/kernel/ptrace.c
index
70c4872
..
45892dc
100644
(file)
--- a/
arch/x86/kernel/ptrace.c
+++ b/
arch/x86/kernel/ptrace.c
@@
-801,7
+801,8
@@
void ptrace_disable(struct task_struct *child)
static const struct user_regset_view user_x86_32_view; /* Initialized below. */
#endif
static const struct user_regset_view user_x86_32_view; /* Initialized below. */
#endif
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+ unsigned long addr, unsigned long data)
{
int ret;
unsigned long __user *datap = (unsigned long __user *)data;
{
int ret;
unsigned long __user *datap = (unsigned long __user *)data;
@@
-812,8
+813,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
unsigned long tmp;
ret = -EIO;
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 */
break;
tmp = 0; /* Default return condition */
@@
-830,8
+830,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO;
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))
break;
if (addr < sizeof(struct user_regs_struct))
@@
-888,17
+887,17
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
case PTRACE_GET_THREAD_AREA:
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
case PTRACE_GET_THREAD_AREA:
- if (addr < 0)
+ if (
(int)
addr < 0)
return -EIO;
ret = do_get_thread_area(child, addr,
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:
break;
case PTRACE_SET_THREAD_AREA:
- if (addr < 0)
+ if (
(int)
addr < 0)
return -EIO;
ret = do_set_thread_area(child, addr,
return -EIO;
ret = do_set_thread_area(child, addr,
-
(struct user_desc __user *)
data, 0);
+
(struct user_desc __user *)
data, 0);
break;
#endif
break;
#endif