vserver 2.0 rc7

[linux-2.6.git] / arch / ppc / kernel / syscalls.c

diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c
index 7e1dad4..4f8876b 100644 (file)
--- a/arch/ppc/kernel/syscalls.c
+++ b/arch/ppc/kernel/syscalls.c
@@ -78,7 +78,7 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif
 
                if (!ptr)
                        break;
-               if ((ret = verify_area (VERIFY_READ, ptr, sizeof(long)))
+               if ((ret = access_ok(VERIFY_READ, ptr, sizeof(long)) ? 0 : -EFAULT)
                    || (ret = get_user(fourth.__pad, (void __user *__user *)ptr)))
                        break;
                ret = sys_semctl (first, second, third, fourth);
@@ -94,7 +94,7 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif
 
                        if (!ptr)
                                break;
-                       if ((ret = verify_area (VERIFY_READ, ptr, sizeof(tmp)))
+                       if ((ret = access_ok(VERIFY_READ, ptr, sizeof(tmp)) ? 0 : -EFAULT)
                            || (ret = copy_from_user(&tmp,
                                        (struct ipc_kludge __user *) ptr,
                                        sizeof (tmp)) ? -EFAULT : 0))
@@ -118,8 +118,8 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif
        case SHMAT: {
                ulong raddr;
 
-               if ((ret = verify_area(VERIFY_WRITE, (ulong __user *) third,
-                                      sizeof(ulong))))
+               if ((ret = access_ok(VERIFY_WRITE, (ulong __user *) third,
+                                      sizeof(ulong)) ? 0 : -EFAULT))
                        break;
                ret = do_shmat (first, (char __user *) ptr, second, &raddr);
                if (ret)
@@ -214,7 +214,7 @@ ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, s
        if ( (unsigned long)n >= 4096 )
        {
                unsigned long __user *buffer = (unsigned long __user *)n;
-               if (verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long))
+               if (!access_ok(VERIFY_READ, buffer, 5*sizeof(unsigned long))
                    || __get_user(n, buffer)
                    || __get_user(inp, ((fd_set __user * __user *)(buffer+1)))
                    || __get_user(outp, ((fd_set  __user * __user *)(buffer+2)))