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

Commit 610d18f4 authored by Davide Libenzi's avatar Davide Libenzi Committed by Linus Torvalds
Browse files

timerfd: add flags check 



As requested by Michael, add a missing check for valid flags in
timerfd_settime(), and make it return EINVAL in case some extra bits are
set.

Michael said:
If this is to be any use to userland apps that want to check flag
support (perhaps it is too late already), then the sooner we get it
into the kernel the better: 2.6.29 would be good; earlier stables as
well would be even better.

[akpm@linux-foundation.org: remove unused TFD_FLAGS_SET]
Acked-by: default avatarMichael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Cc: <stable@kernel.org>		[2.6.27.x, 2.6.28.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef35ce23

fs/timerfd.c

+6 −6
Original line number Diff line number Diff line
@@ -186,10 +186,9 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) 
	BUILD_BUG_ON(TFD_CLOEXEC != O_CLOEXEC);

	BUILD_BUG_ON(TFD_NONBLOCK != O_NONBLOCK);



	if (flags & ~(TFD_CLOEXEC | TFD_NONBLOCK))

		return -EINVAL;

	if (clockid != CLOCK_MONOTONIC &&

	    clockid != CLOCK_REALTIME)

	if ((flags & ~TFD_CREATE_FLAGS) ||

	    (clockid != CLOCK_MONOTONIC &&

	     clockid != CLOCK_REALTIME))

		return -EINVAL;



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -201,7 +200,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) 
	hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS);



	ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx,

			       flags & (O_CLOEXEC | O_NONBLOCK));

			       flags & TFD_SHARED_FCNTL_FLAGS);

	if (ufd < 0)

		kfree(ctx);
@@ -219,7 +218,8 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, 
	if (copy_from_user(&ktmr, utmr, sizeof(ktmr)))

		return -EFAULT;



	if (!timespec_valid(&ktmr.it_value) ||

	if ((flags & ~TFD_SETTIME_FLAGS) ||

	    !timespec_valid(&ktmr.it_value) ||

	    !timespec_valid(&ktmr.it_interval))

		return -EINVAL;

include/linux/timerfd.h

+12 −4
Original line number Diff line number Diff line
@@ -11,13 +11,21 @@ 
/* For O_CLOEXEC and O_NONBLOCK */

#include <linux/fcntl.h>



/* Flags for timerfd_settime.  */

/*

 * CAREFUL: Check include/asm-generic/fcntl.h when defining

 * new flags, since they might collide with O_* ones. We want

 * to re-use O_* flags that couldn't possibly have a meaning

 * from eventfd, in order to leave a free define-space for

 * shared O_* flags.

 */

#define TFD_TIMER_ABSTIME (1 << 0)



/* Flags for timerfd_create.  */

#define TFD_CLOEXEC O_CLOEXEC

#define TFD_NONBLOCK O_NONBLOCK



#define TFD_SHARED_FCNTL_FLAGS (TFD_CLOEXEC | TFD_NONBLOCK)

/* Flags for timerfd_create.  */

#define TFD_CREATE_FLAGS TFD_SHARED_FCNTL_FLAGS

/* Flags for timerfd_settime.  */

#define TFD_SETTIME_FLAGS TFD_TIMER_ABSTIME



#endif /* _LINUX_TIMERFD_H */