Skip to content

Commit

Permalink
switch timerfd_[sg]ettime(2) to fget_light()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Sep 27, 2012
1 parent 5e196a9 commit 4109633
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions fs/timerfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,15 @@ static const struct file_operations timerfd_fops = {
.llseek = noop_llseek,
};

static struct file *timerfd_fget(int fd)
static struct file *timerfd_fget(int fd, int *fput_needed)
{
struct file *file;

file = fget(fd);
file = fget_light(fd, fput_needed);
if (!file)
return ERR_PTR(-EBADF);
if (file->f_op != &timerfd_fops) {
fput(file);
fput_light(file, *fput_needed);
return ERR_PTR(-EINVAL);
}

Expand Down Expand Up @@ -287,7 +287,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
struct file *file;
struct timerfd_ctx *ctx;
struct itimerspec ktmr, kotmr;
int ret;
int ret, fput_needed;

if (copy_from_user(&ktmr, utmr, sizeof(ktmr)))
return -EFAULT;
Expand All @@ -297,7 +297,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
!timespec_valid(&ktmr.it_interval))
return -EINVAL;

file = timerfd_fget(ufd);
file = timerfd_fget(ufd, &fput_needed);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = file->private_data;
Expand Down Expand Up @@ -334,7 +334,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
ret = timerfd_setup(ctx, flags, &ktmr);

spin_unlock_irq(&ctx->wqh.lock);
fput(file);
fput_light(file, fput_needed);
if (otmr && copy_to_user(otmr, &kotmr, sizeof(kotmr)))
return -EFAULT;

Expand All @@ -346,8 +346,9 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
struct file *file;
struct timerfd_ctx *ctx;
struct itimerspec kotmr;
int fput_needed;

file = timerfd_fget(ufd);
file = timerfd_fget(ufd, &fput_needed);
if (IS_ERR(file))
return PTR_ERR(file);
ctx = file->private_data;
Expand All @@ -362,7 +363,7 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
kotmr.it_value = ktime_to_timespec(timerfd_get_remaining(ctx));
kotmr.it_interval = ktime_to_timespec(ctx->tintv);
spin_unlock_irq(&ctx->wqh.lock);
fput(file);
fput_light(file, fput_needed);

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

0 comments on commit 4109633

Please sign in to comment.