Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e803baf authored by Heiko Carstens's avatar Heiko Carstens Committed by Al Viro
Browse files

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.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent dfbb83d3

fs/timerfd.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -383,10 +383,10 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr) 
	return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0;

	return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0;

}

}





#ifdef COMPAT

#ifdef CONFIG_COMPAT

COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,

COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,

		const struct itimerspec __user *, utmr,

		const struct compat_itimerspec __user *, utmr,

		struct itimerspec __user *, otmr)

		struct compat_itimerspec __user *, otmr)

{

{

	struct itimerspec new, old;

	struct itimerspec new, old;

	int ret;

	int ret;
@@ -402,12 +402,12 @@ COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, 
}

}





COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,

COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,

		struct itimerspec __user *, otmr)

		struct compat_itimerspec __user *, otmr)

{

{

	struct itimerspec kotmr;

	struct itimerspec kotmr;

	int ret = do_timerfd_gettime(ufd, &kotmr);

	int ret = do_timerfd_gettime(ufd, &kotmr);

	if (ret)

	if (ret)

		return ret;

		return ret;

	return put_compat_itimerspec(otmr, &t) ? -EFAULT: 0;

	return put_compat_itimerspec(otmr, &kotmr) ? -EFAULT: 0;

}

}

#endif
 
#endif