compat: restore timerfd_settime and timerfd_gettime compat
Subsystems (2)
PATCH 1/1 compat: restore timerfd_settime and timerfd_gettime compat
Quoted 1 line
From
16f8402d45de11a1699ca584a6605806fe60bfc5Mon Sep 17 00:00:00 2001
From: Heiko Carstens <[email protected]>
Date: Sat, 2 Mar 2013 12:26:30 +0100
Subject: [PATCH] compat: restore timerfd settime and gettime compat syscalls
Both compat syscalls got lost with 9d94b9e2 "switch timerfd compat syscalls to COMPAT_SYSCALL_DEFINE" because of a typo:
COMPAT instead of CONFIG_COMPAT.
--- fs/timerfd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/timerfd.c +5 -5
@@ -383,10 +383,10 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)return copy_to_user (otmr, &kotmr,sizeof (kotmr)) ? -EFAULT :0 ; } -#ifdef COMPAT +#ifdef CONFIG_COMPAT COMPAT_SYSCALL_DEFINE4 (timerfd_settime, int, ufd, int, flags, - const struct itimerspec __user *, utmr, - struct itimerspec __user *, otmr) + const struct compat_itimerspec __user *, utmr, + struct compat_itimerspec __user *, otmr) {struct itimerspec new, old;int ret;
@@ -402,12 +402,12 @@ COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, } COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd, - struct itimerspec __user *, otmr) + struct compat_itimerspec __user *, otmr) {struct itimerspec kotmr;int ret =do_timerfd_gettime (ufd, &kotmr);if (ret)return ret; -return put_compat_itimerspec (otmr, &t) ? -EFAULT :0 ; +return put_compat_itimerspec (otmr, &kotmr) ? -EFAULT :0 ; }#endif
Signature · 1 line
1.7.12.4
Quoted 8 lines · Heiko Carstens
Quoted 1 line
From
16f8402d45de11a1699ca584a6605806fe60bfc5Mon Sep 17 00:00:00 2001From: Heiko Carstens <[email protected]>
Date: Sat, 2 Mar 2013 12:26:30 +0100
Subject: [PATCH] compat: restore timerfd settime and gettime compat syscallsBoth compat syscalls got lost with
9d94b9e2"switch timerfd compat syscalls toCOMPAT_SYSCALL_DEFINE" because of a typo:
COMPAT instead ofCONFIG_COMPAT.
Applied, thanks. I'll push fixes to Linus in about an hour...