This patch converts verify_area to access_ok for sparc and sparc64.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/sparc/kernel/ptrace.c | 16 ++++++++--------
25-akpm/arch/sparc/kernel/signal.c | 8 ++++----
25-akpm/arch/sparc/kernel/sys_sparc.c | 4 ++--
25-akpm/arch/sparc/kernel/sys_sunos.c | 4 ++--
25-akpm/arch/sparc/kernel/unaligned.c | 23 +++++++++--------------
25-akpm/arch/sparc64/kernel/binfmt_aout32.c | 4 ++--
25-akpm/arch/sparc64/kernel/signal32.c | 6 +++---
7 files changed, 30 insertions(+), 35 deletions(-)
diff -puN arch/sparc64/kernel/binfmt_aout32.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc64/kernel/binfmt_aout32.c
--- 25/arch/sparc64/kernel/binfmt_aout32.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc64/kernel/binfmt_aout32.c 2005-03-03 22:09:35.000000000 -0800
@@ -114,9 +114,9 @@ static int aout32_core_dump(long signr,
/* make sure we actually have a data and stack area to dump */
set_fs(USER_DS);
- if (verify_area(VERIFY_READ, (void __user *) START_DATA(dump), dump.u_dsize))
+ if (!access_ok(VERIFY_READ, (void __user *) START_DATA(dump), dump.u_dsize))
dump.u_dsize = 0;
- if (verify_area(VERIFY_READ, (void __user *) START_STACK(dump), dump.u_ssize))
+ if (!access_ok(VERIFY_READ, (void __user *) START_STACK(dump), dump.u_ssize))
dump.u_ssize = 0;
set_fs(KERNEL_DS);
diff -puN arch/sparc64/kernel/signal32.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc64/kernel/signal32.c
--- 25/arch/sparc64/kernel/signal32.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc64/kernel/signal32.c 2005-03-03 22:09:35.000000000 -0800
@@ -351,7 +351,7 @@ void do_new_sigreturn32(struct pt_regs *
sf = (struct new_signal_frame32 __user *) regs->u_regs[UREG_FP];
/* 1. Make sure we are not getting garbage from the user */
- if (verify_area(VERIFY_READ, sf, sizeof(*sf)) ||
+ if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
(((unsigned long) sf) & 3))
goto segv;
@@ -436,7 +436,7 @@ asmlinkage void do_sigreturn32(struct pt
scptr = (struct sigcontext32 __user *)
(regs->u_regs[UREG_I0] & 0x00000000ffffffffUL);
/* Check sanity of the user arg. */
- if (verify_area(VERIFY_READ, scptr, sizeof(struct sigcontext32)) ||
+ if (!access_ok(VERIFY_READ, scptr, sizeof(struct sigcontext32)) ||
(((unsigned long) scptr) & 3))
goto segv;
@@ -504,7 +504,7 @@ asmlinkage void do_rt_sigreturn32(struct
sf = (struct rt_signal_frame32 __user *) regs->u_regs[UREG_FP];
/* 1. Make sure we are not getting garbage from the user */
- if (verify_area(VERIFY_READ, sf, sizeof(*sf)) ||
+ if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
(((unsigned long) sf) & 3))
goto segv;
diff -puN arch/sparc/kernel/ptrace.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc/kernel/ptrace.c
--- 25/arch/sparc/kernel/ptrace.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc/kernel/ptrace.c 2005-03-03 22:09:35.000000000 -0800
@@ -374,8 +374,8 @@ asmlinkage void do_ptrace(struct pt_regs
struct pt_regs *cregs = child->thread.kregs;
int rval;
- rval = verify_area(VERIFY_WRITE, pregs, sizeof(struct pt_regs));
- if(rval) {
+ if (!access_ok(VERIFY_WRITE, pregs, sizeof(struct pt_regs))) {
+ rval = -EFAULT;
pt_error_return(regs, -rval);
goto out_tsk;
}
@@ -401,8 +401,8 @@ asmlinkage void do_ptrace(struct pt_regs
/* Must be careful, tracing process can only set certain
* bits in the psr.
*/
- i = verify_area(VERIFY_READ, pregs, sizeof(struct pt_regs));
- if(i) {
+ if (!access_ok(VERIFY_READ, pregs, sizeof(struct pt_regs))) {
+ i = -EFAULT;
pt_error_return(regs, -i);
goto out_tsk;
}
@@ -439,8 +439,8 @@ asmlinkage void do_ptrace(struct pt_regs
struct fps __user *fps = (struct fps __user *) addr;
int i;
- i = verify_area(VERIFY_WRITE, fps, sizeof(struct fps));
- if(i) {
+ if (!access_ok(VERIFY_WRITE, fps, sizeof(struct fps))) {
+ i = -EFAULT;
pt_error_return(regs, -i);
goto out_tsk;
}
@@ -474,8 +474,8 @@ asmlinkage void do_ptrace(struct pt_regs
struct fps __user *fps = (struct fps __user *) addr;
int i;
- i = verify_area(VERIFY_READ, fps, sizeof(struct fps));
- if(i) {
+ if (!access_ok(VERIFY_READ, fps, sizeof(struct fps))) {
+ i = -EFAULT;
pt_error_return(regs, -i);
goto out_tsk;
}
diff -puN arch/sparc/kernel/signal.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc/kernel/signal.c
--- 25/arch/sparc/kernel/signal.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc/kernel/signal.c 2005-03-03 22:09:35.000000000 -0800
@@ -205,7 +205,7 @@ restore_fpu_state(struct pt_regs *regs,
set_used_math();
clear_tsk_thread_flag(current, TIF_USEDFPU);
- if (verify_area(VERIFY_READ, fpu, sizeof(*fpu)))
+ if (!access_ok(VERIFY_READ, fpu, sizeof(*fpu)))
return -EFAULT;
err = __copy_from_user(¤t->thread.float_regs[0], &fpu->si_float_regs[0],
@@ -231,7 +231,7 @@ static inline void do_new_sigreturn (str
sf = (struct new_signal_frame __user *) regs->u_regs[UREG_FP];
/* 1. Make sure we are not getting garbage from the user */
- if (verify_area(VERIFY_READ, sf, sizeof(*sf)))
+ if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
goto segv_and_exit;
if (((unsigned long) sf) & 3)
@@ -297,7 +297,7 @@ asmlinkage void do_sigreturn(struct pt_r
scptr = (struct sigcontext __user *) regs->u_regs[UREG_I0];
/* Check sanity of the user arg. */
- if (verify_area(VERIFY_READ, scptr, sizeof(struct sigcontext)) ||
+ if (!access_ok(VERIFY_READ, scptr, sizeof(struct sigcontext)) ||
(((unsigned long) scptr) & 3))
goto segv_and_exit;
@@ -356,7 +356,7 @@ asmlinkage void do_rt_sigreturn(struct p
synchronize_user_stack();
sf = (struct rt_signal_frame __user *) regs->u_regs[UREG_FP];
- if (verify_area(VERIFY_READ, sf, sizeof(*sf)) ||
+ if (!access_ok(VERIFY_READ, sf, sizeof(*sf)) ||
(((unsigned long) sf) & 0x03))
goto segv;
diff -puN arch/sparc/kernel/sys_sparc.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc/kernel/sys_sparc.c
--- 25/arch/sparc/kernel/sys_sparc.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc/kernel/sys_sparc.c 2005-03-03 22:09:35.000000000 -0800
@@ -399,7 +399,7 @@ sparc_sigaction (int sig, const struct o
if (act) {
unsigned long mask;
- if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+ if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
return -EFAULT;
@@ -417,7 +417,7 @@ sparc_sigaction (int sig, const struct o
* deadlock us if we held the signal lock on SMP. So for
* now I take the easy way out and do no locking.
*/
- if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+ if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
return -EFAULT;
diff -puN arch/sparc/kernel/sys_sunos.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc/kernel/sys_sunos.c
--- 25/arch/sparc/kernel/sys_sunos.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc/kernel/sys_sunos.c 2005-03-03 22:09:35.000000000 -0800
@@ -1131,7 +1131,7 @@ sunos_sigaction(int sig, const struct ol
if (act) {
old_sigset_t mask;
- if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+ if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_flags, &act->sa_flags))
return -EFAULT;
@@ -1152,7 +1152,7 @@ sunos_sigaction(int sig, const struct ol
* But then again we don't support SunOS lwp's anyways ;-)
*/
old_ka.sa.sa_flags ^= SUNOS_SV_INTERRUPT;
- if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+ if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_flags, &oact->sa_flags))
return -EFAULT;
diff -puN arch/sparc/kernel/unaligned.c~verify_area-cleanup-sparc-and-sparc64 arch/sparc/kernel/unaligned.c
--- 25/arch/sparc/kernel/unaligned.c~verify_area-cleanup-sparc-and-sparc64 2005-03-03 22:09:35.000000000 -0800
+++ 25-akpm/arch/sparc/kernel/unaligned.c 2005-03-03 22:09:35.000000000 -0800
@@ -428,40 +428,35 @@ static inline int ok_for_user(struct pt_
enum direction dir)
{
unsigned int reg;
- int retval, check = (dir == load) ? VERIFY_READ : VERIFY_WRITE;
+ int check = (dir == load) ? VERIFY_READ : VERIFY_WRITE;
int size = ((insn >> 19) & 3) == 3 ? 8 : 4;
if ((regs->pc | regs->npc) & 3)
return 0;
- /* Must verify_area() in all the necessary places. */
+ /* Must access_ok() in all the necessary places. */
#define WINREG_ADDR(regnum) \
((void __user *)(((unsigned long *)regs->u_regs[UREG_FP])+(regnum)))
- retval = 0;
reg = (insn >> 25) & 0x1f;
if (reg >= 16) {
- retval = verify_area(check, WINREG_ADDR(reg - 16), size);
- if (retval)
- return retval;
+ if (!access_ok(check, WINREG_ADDR(reg - 16), size))
+ return -EFAULT;
}
reg = (insn >> 14) & 0x1f;
if (reg >= 16) {
- retval = verify_area(check, WINREG_ADDR(reg - 16), size);
- if (retval)
- return retval;
+ if (!access_ok(check, WINREG_ADDR(reg - 16), size))
+ return -EFAULT;
}
if (!(insn & 0x2000)) {
reg = (insn & 0x1f);
if (reg >= 16) {
- retval = verify_area(check, WINREG_ADDR(reg - 16),
- size);
- if (retval)
- return retval;
+ if (!access_ok(check, WINREG_ADDR(reg - 16), size))
+ return -EFAULT;
}
}
- return retval;
#undef WINREG_ADDR
+ return 0;
}
void user_mna_trap_fault(struct pt_regs *regs, unsigned int insn) __asm__ ("user_mna_trap_fault");
_