Commit ff356a63 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] janitor: h8300: put_user for error handling

From: Domen Puncer <domen@coderock.org>

verify_area isn't needed.
parent 3c7e45bd
...@@ -285,9 +285,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -285,9 +285,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
ret = read_long(child, addr, &tmp); ret = read_long(child, addr, &tmp);
if (ret < 0) if (ret < 0)
break ; break ;
ret = verify_area(VERIFY_WRITE, (void *) data, sizeof(long)); ret = put_user(tmp, (unsigned long *) data);
if (!ret)
put_user(tmp, (unsigned long *) data);
break ; break ;
} }
...@@ -298,10 +296,6 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -298,10 +296,6 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) if ((addr & 3) || addr < 0 || addr >= sizeof(struct user))
ret = -EIO; ret = -EIO;
ret = verify_area(VERIFY_WRITE, (void *) data,
sizeof(long));
if (ret)
break ;
tmp = 0; /* Default return condition */ tmp = 0; /* Default return condition */
addr = addr >> 2; /* temporary hack. */ addr = addr >> 2; /* temporary hack. */
if (addr < 10) if (addr < 10)
...@@ -310,8 +304,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -310,8 +304,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
ret = -EIO; ret = -EIO;
break ; break ;
} }
put_user(tmp,(unsigned long *) data); ret = put_user(tmp,(unsigned long *) data);
ret = 0;
break ; 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