vserver 2.0 rc7

[linux-2.6.git] / arch / m32r / kernel / sys_m32r.c

diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index 356e895..e0500e1 100644 (file)
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -171,9 +171,9 @@ asmlinkage int sys_ipc(uint call, int first, int second,
        case SHMAT: {
                ulong raddr;
 
-               if ((ret = verify_area(VERIFY_WRITE, (ulong __user *) third,
-                                     sizeof(ulong))))
-                       return ret;
+               if (!access_ok(VERIFY_WRITE, (ulong __user *) third,
+                                     sizeof(ulong)))
+                       return -EFAULT;
                ret = do_shmat (first, (char __user *) ptr, second, &raddr);
                if (ret)
                        return ret;