y2038: itimer: compat handling to itimer.c

The structure is only used in one place, moving it there simplifies the
interface and helps with later changes to this code.

Rename it to match the other time32 structures in the process.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 3735a22..906a0ea 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -116,14 +116,7 @@ typedef __compat_gid32_t   compat_gid_t;
 struct compat_sel_arg_struct;
 struct rusage;
 
-struct compat_itimerval {
-       struct old_timeval32    it_interval;
-       struct old_timeval32    it_value;
-};
-
-struct itimerval;
-int get_compat_itimerval(struct itimerval *, const struct compat_itimerval __user *);
-int put_compat_itimerval(struct compat_itimerval __user *, const struct itimerval *);
+struct old_itimerval32;
 
 struct compat_tms {
        compat_clock_t          tms_utime;
@@ -668,10 +661,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
 
 /* kernel/itimer.c */
 asmlinkage long compat_sys_getitimer(int which,
-                                    struct compat_itimerval __user *it);
+                                    struct old_itimerval32 __user *it);
 asmlinkage long compat_sys_setitimer(int which,
-                                    struct compat_itimerval __user *in,
-                                    struct compat_itimerval __user *out);
+                                    struct old_itimerval32 __user *in,
+                                    struct old_itimerval32 __user *out);
 
 /* kernel/kexec.c */
 asmlinkage long compat_sys_kexec_load(compat_ulong_t entry,

diff --git a/kernel/compat.c b/kernel/compat.c
index a2bc1d6..95005f8 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -90,30 +90,6 @@ int compat_put_timespec(const struct timespec *ts, void __user *uts)
 }
 EXPORT_SYMBOL_GPL(compat_put_timespec);
 
-int get_compat_itimerval(struct itimerval *o, const struct compat_itimerval __user *i)
-{
-       struct compat_itimerval v32;
-
-       if (copy_from_user(&v32, i, sizeof(struct compat_itimerval)))
-               return -EFAULT;
-       o->it_interval.tv_sec = v32.it_interval.tv_sec;
-       o->it_interval.tv_usec = v32.it_interval.tv_usec;
-       o->it_value.tv_sec = v32.it_value.tv_sec;
-       o->it_value.tv_usec = v32.it_value.tv_usec;
-       return 0;
-}
-
-int put_compat_itimerval(struct compat_itimerval __user *o, const struct itimerval *i)
-{
-       struct compat_itimerval v32;
-
-       v32.it_interval.tv_sec = i->it_interval.tv_sec;
-       v32.it_interval.tv_usec = i->it_interval.tv_usec;
-       v32.it_value.tv_sec = i->it_value.tv_sec;
-       v32.it_value.tv_usec = i->it_value.tv_usec;
-       return copy_to_user(o, &v32, sizeof(struct compat_itimerval)) ? -EFAULT : 0;
-}
-
 #ifdef __ARCH_WANT_SYS_SIGPROCMASK
 
 /*

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 77f1e56..c52ebb4 100644 (file)
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -112,19 +112,34 @@ SYSCALL_DEFINE2(getitimer, int, which, struct itimerval __user *, value)
 }
 
 #ifdef CONFIG_COMPAT
+struct old_itimerval32 {
+       struct old_timeval32    it_interval;
+       struct old_timeval32    it_value;
+};
+
+static int put_old_itimerval32(struct old_itimerval32 __user *o, const struct itimerval *i)
+{
+       struct old_itimerval32 v32;
+
+       v32.it_interval.tv_sec = i->it_interval.tv_sec;
+       v32.it_interval.tv_usec = i->it_interval.tv_usec;
+       v32.it_value.tv_sec = i->it_value.tv_sec;
+       v32.it_value.tv_usec = i->it_value.tv_usec;
+       return copy_to_user(o, &v32, sizeof(struct old_itimerval32)) ? -EFAULT : 0;
+}
+
 COMPAT_SYSCALL_DEFINE2(getitimer, int, which,
-                      struct compat_itimerval __user *, it)
+                      struct old_itimerval32 __user *, it)
 {
        struct itimerval kit;
        int error = do_getitimer(which, &kit);
 
-       if (!error && put_compat_itimerval(it, &kit))
+       if (!error && put_old_itimerval32(it, &kit))
                error = -EFAULT;
        return error;
 }
 #endif
 
-
 /*
  * The timer is automagically restarted, when interval != 0
  */
@@ -310,15 +325,28 @@ SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value,
 }
 
 #ifdef CONFIG_COMPAT
+static int get_old_itimerval32(struct itimerval *o, const struct old_itimerval32 __user *i)
+{
+       struct old_itimerval32 v32;
+
+       if (copy_from_user(&v32, i, sizeof(struct old_itimerval32)))
+               return -EFAULT;
+       o->it_interval.tv_sec = v32.it_interval.tv_sec;
+       o->it_interval.tv_usec = v32.it_interval.tv_usec;
+       o->it_value.tv_sec = v32.it_value.tv_sec;
+       o->it_value.tv_usec = v32.it_value.tv_usec;
+       return 0;
+}
+
 COMPAT_SYSCALL_DEFINE3(setitimer, int, which,
-                      struct compat_itimerval __user *, in,
-                      struct compat_itimerval __user *, out)
+                      struct old_itimerval32 __user *, in,
+                      struct old_itimerval32 __user *, out)
 {
        struct itimerval kin, kout;
        int error;
 
        if (in) {
-               if (get_compat_itimerval(&kin, in))
+               if (get_old_itimerval32(&kin, in))
                        return -EFAULT;
        } else {
                memset(&kin, 0, sizeof(kin));
@@ -327,7 +355,7 @@ COMPAT_SYSCALL_DEFINE3(setitimer, int, which,
        error = do_setitimer(which, &kin, out ? &kout : NULL);
        if (error || !out)
                return error;
-       if (put_compat_itimerval(out, &kout))
+       if (put_old_itimerval32(out, &kout))
                return -EFAULT;
        return 0;
 }