aboutsummaryrefslogtreecommitdiffstats
path: root/fs/timerfd.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/timerfd.c')
-rw-r--r--fs/timerfd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c
index d69ad801eb80..803ca070d42e 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -561,29 +561,29 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct __kernel_itimerspec __user *,
561 561
562#ifdef CONFIG_COMPAT_32BIT_TIME 562#ifdef CONFIG_COMPAT_32BIT_TIME
563COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, 563COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
564 const struct compat_itimerspec __user *, utmr, 564 const struct old_itimerspec32 __user *, utmr,
565 struct compat_itimerspec __user *, otmr) 565 struct old_itimerspec32 __user *, otmr)
566{ 566{
567 struct itimerspec64 new, old; 567 struct itimerspec64 new, old;
568 int ret; 568 int ret;
569 569
570 if (get_compat_itimerspec64(&new, utmr)) 570 if (get_old_itimerspec32(&new, utmr))
571 return -EFAULT; 571 return -EFAULT;
572 ret = do_timerfd_settime(ufd, flags, &new, &old); 572 ret = do_timerfd_settime(ufd, flags, &new, &old);
573 if (ret) 573 if (ret)
574 return ret; 574 return ret;
575 if (otmr && put_compat_itimerspec64(&old, otmr)) 575 if (otmr && put_old_itimerspec32(&old, otmr))
576 return -EFAULT; 576 return -EFAULT;
577 return ret; 577 return ret;
578} 578}
579 579
580COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd, 580COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,
581 struct compat_itimerspec __user *, otmr) 581 struct old_itimerspec32 __user *, otmr)
582{ 582{
583 struct itimerspec64 kotmr; 583 struct itimerspec64 kotmr;
584 int ret = do_timerfd_gettime(ufd, &kotmr); 584 int ret = do_timerfd_gettime(ufd, &kotmr);
585 if (ret) 585 if (ret)
586 return ret; 586 return ret;
587 return put_compat_itimerspec64(&kotmr, otmr) ? -EFAULT : 0; 587 return put_old_itimerspec32(&kotmr, otmr) ? -EFAULT : 0;
588} 588}
589#endif 589#endif