Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394

[pandora-kernel.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 70c5af4..7f8e26e 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -114,6 +114,7 @@ asmlinkage long compat_sys_newlstat(char __user * filename,
        return error;
 }
 
+#ifndef __ARCH_WANT_STAT64
 asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
                struct compat_stat __user *statbuf, int flag)
 {
@@ -134,6 +135,7 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
 out:
        return error;
 }
+#endif
 
 asmlinkage long compat_sys_newfstat(unsigned int fd,
                struct compat_stat __user * statbuf)
@@ -1474,10 +1476,9 @@ int compat_do_execve(char * filename,
        int i;
 
        retval = -ENOMEM;
-       bprm = kmalloc(sizeof(*bprm), GFP_KERNEL);
+       bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);
        if (!bprm)
                goto out_ret;
-       memset(bprm, 0, sizeof(*bprm));
 
        file = open_exec(filename);
        retval = PTR_ERR(file);
@@ -1638,15 +1639,6 @@ void compat_set_fd_set(unsigned long nr, compat_ulong_t __user *ufdset,
  * This is a virtual copy of sys_select from fs/select.c and probably
  * should be compared to it from time to time
  */
-static void *select_bits_alloc(int size)
-{
-       return kmalloc(6 * size, GFP_KERNEL);
-}
-
-static void select_bits_free(void *bits, int size)
-{
-       kfree(bits);
-}
 
 /*
  * We can actually return ERESTARTSYS instead of EINTR, but I'd
@@ -1685,7 +1677,7 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp,
         */
        ret = -ENOMEM;
        size = FDS_BYTES(n);
-       bits = select_bits_alloc(size);
+       bits = kmalloc(6 * size, GFP_KERNEL);
        if (!bits)
                goto out_nofds;
        fds.in      = (unsigned long *)  bits;
@@ -1719,7 +1711,7 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp,
        compat_set_fd_set(n, exp, fds.res_ex);
 
 out:
-       select_bits_free(bits, size);
+       kfree(bits);
 out_nofds:
        return ret;
 }
@@ -1751,11 +1743,15 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
        ret = compat_core_sys_select(n, inp, outp, exp, &timeout);
 
        if (tvp) {
+               struct compat_timeval rtv;
+
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
-               tv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
-               tv.tv_sec = timeout;
-               if (copy_to_user(tvp, &tv, sizeof(tv))) {
+               rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
+               rtv.tv_sec = timeout;
+               if (compat_timeval_compare(&rtv, &tv) >= 0)
+                       rtv = tv;
+               if (copy_to_user(tvp, &rtv, sizeof(rtv))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
@@ -1822,13 +1818,17 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
        } while (!ret && !timeout && tsp && (ts.tv_sec || ts.tv_nsec));
 
        if (tsp && !(current->personality & STICKY_TIMEOUTS)) {
-               ts.tv_sec += timeout / HZ;
-               ts.tv_nsec += (timeout % HZ) * (1000000000/HZ);
-               if (ts.tv_nsec >= 1000000000) {
-                       ts.tv_sec++;
-                       ts.tv_nsec -= 1000000000;
+               struct compat_timespec rts;
+
+               rts.tv_sec = timeout / HZ;
+               rts.tv_nsec = (timeout % HZ) * (NSEC_PER_SEC/HZ);
+               if (rts.tv_nsec >= NSEC_PER_SEC) {
+                       rts.tv_sec++;
+                       rts.tv_nsec -= NSEC_PER_SEC;
                }
-               (void)copy_to_user(tsp, &ts, sizeof(ts));
+               if (compat_timespec_compare(&rts, &ts) >= 0)
+                       rts = ts;
+               copy_to_user(tsp, &rts, sizeof(rts));
        }
 
        if (ret == -ERESTARTNOHAND) {
@@ -1918,12 +1918,17 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 
        if (tsp && timeout >= 0) {
+               struct compat_timespec rts;
+
                if (current->personality & STICKY_TIMEOUTS)
                        goto sticky;
                /* Yes, we know it's actually an s64, but it's also positive. */
-               ts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * 1000;
-               ts.tv_sec = timeout;
-               if (copy_to_user(tsp, &ts, sizeof(ts))) {
+               rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) *
+                                       1000;
+               rts.tv_sec = timeout;
+               if (compat_timespec_compare(&rts, &ts) >= 0)
+                       rts = ts;
+               if (copy_to_user(tsp, &rts, sizeof(rts))) {
 sticky:
                        /*
                         * If an application puts its timeval in read-only
@@ -2155,9 +2160,12 @@ asmlinkage long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *
 
        default:
                err = -EINVAL;
-               goto done;
+               break;
        }
 
+       if (err)
+               goto done;
+
        oldfs = get_fs();
        set_fs(KERNEL_DS);
        /* The __user pointer casts are valid because of the set_fs() */