Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / arch / s390 / kernel / sys_s390.c

diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index c51ff0d..9ea8bec 100644 (file)
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -37,7 +37,7 @@
  * sys_pipe() is the normal C calling standard for creating
  * a pipe. It's not the way Unix traditionally does this, though.
  */
-asmlinkage long sys_pipe(unsigned long * fildes)
+asmlinkage long sys_pipe(unsigned long __user *fildes)
 {
        int fd[2];
        int error;
@@ -92,7 +92,7 @@ struct mmap_arg_struct {
        unsigned long offset;
 };
 
-asmlinkage long sys_mmap2(struct mmap_arg_struct *arg)
+asmlinkage long sys_mmap2(struct mmap_arg_struct __user  *arg)
 {
        struct mmap_arg_struct a;
        int error = -EFAULT;
@@ -104,7 +104,7 @@ out:
        return error;
 }
 
-asmlinkage long old_mmap(struct mmap_arg_struct *arg)
+asmlinkage long old_mmap(struct mmap_arg_struct __user *arg)
 {
        struct mmap_arg_struct a;
        long error = -EFAULT;
@@ -128,7 +128,7 @@ struct sel_arg_struct {
        struct timeval *tvp;
 };
 
-asmlinkage long old_select(struct sel_arg_struct *arg)
+asmlinkage long old_select(struct sel_arg_struct __user *arg)
 {
        struct sel_arg_struct a;
 
@@ -145,37 +145,37 @@ asmlinkage long old_select(struct sel_arg_struct *arg)
  *
  * This is really horribly ugly.
  */
-asmlinkage long sys_ipc (uint call, int first, int second,
-                                 unsigned long third, void *ptr)
+asmlinkage long sys_ipc(uint call, int first, int second,
+                                 unsigned long third, void __user *ptr)
 {
         struct ipc_kludge tmp;
        int ret;
 
         switch (call) {
         case SEMOP:
-               return sys_semtimedop (first, (struct sembuf *) ptr, second,
+               return sys_semtimedop (first, (struct sembuf __user *) ptr, second,
                                       NULL);
        case SEMTIMEDOP:
-               return sys_semtimedop (first, (struct sembuf *) ptr, second,
-                                      (const struct timespec *) third);
+               return sys_semtimedop (first, (struct sembuf __user *) ptr, second,
+                                      (const struct timespec __user *) third);
         case SEMGET:
                 return sys_semget (first, second, third);
         case SEMCTL: {
                 union semun fourth;
                 if (!ptr)
                         return -EINVAL;
-                if (get_user(fourth.__pad, (void **) ptr))
+                if (get_user(fourth.__pad, (void __user * __user *) ptr))
                         return -EFAULT;
                 return sys_semctl (first, second, third, fourth);
-        } 
+        }
         case MSGSND:
-               return sys_msgsnd (first, (struct msgbuf *) ptr, 
+               return sys_msgsnd (first, (struct msgbuf __user *) ptr,
                                    second, third);
                break;
         case MSGRCV:
                 if (!ptr)
                         return -EINVAL;
-                if (copy_from_user (&tmp, (struct ipc_kludge *) ptr,
+                if (copy_from_user (&tmp, (struct ipc_kludge __user *) ptr,
                                     sizeof (struct ipc_kludge)))
                         return -EFAULT;
                 return sys_msgrcv (first, tmp.msgp,
@@ -183,33 +183,33 @@ asmlinkage long sys_ipc (uint call, int first, int second,
         case MSGGET:
                 return sys_msgget ((key_t) first, second);
         case MSGCTL:
-                return sys_msgctl (first, second, (struct msqid_ds *) ptr);
-                
+                return sys_msgctl (first, second, (struct msqid_ds __user *) ptr);
+
        case SHMAT: {
                ulong raddr;
-               ret = do_shmat (first, (char *) ptr, second, &raddr);
+               ret = do_shmat (first, (char __user *) ptr, second, &raddr);
                if (ret)
                        return ret;
-               return put_user (raddr, (ulong *) third);
+               return put_user (raddr, (ulong __user *) third);
                break;
         }
-       case SHMDT: 
-               return sys_shmdt ((char *)ptr);
+       case SHMDT:
+               return sys_shmdt ((char __user *)ptr);
        case SHMGET:
                return sys_shmget (first, second, third);
        case SHMCTL:
                return sys_shmctl (first, second,
-                                   (struct shmid_ds *) ptr);
+                                   (struct shmid_ds __user *) ptr);
        default:
                return -ENOSYS;
 
        }
-        
+
        return -EINVAL;
 }
 
 #ifdef CONFIG_ARCH_S390X
-asmlinkage long s390x_newuname(struct new_utsname * name)
+asmlinkage long s390x_newuname(struct new_utsname __user *name)
 {
        int ret = sys_newuname(name);
 
@@ -256,7 +256,7 @@ struct fadvise64_64_args {
 };
 
 asmlinkage long
-s390_fadvise64_64(struct fadvise64_64_args *args)
+s390_fadvise64_64(struct fadvise64_64_args __user *args)
 {
        struct fadvise64_64_args a;