Skip to content

Commit

Permalink
fcntl: return -EFAULT if copy_to_user fails
Browse files Browse the repository at this point in the history
copy_to_user() returns the number of bytes remaining, but we want to
return -EFAULT.
	ret = fcntl(fd, F_SETOWN_EX, NULL);
With the original code ret would be 8 here.

V2: Takuya Yoshikawa pointed out a similar issue in f_getown_ex()

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Dan Carpenter authored and Al Viro committed Jun 4, 2010
1 parent 7d683a0 commit 5b54470
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/fcntl.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)

ret = copy_from_user(&owner, owner_p, sizeof(owner));
if (ret)
return ret;
return -EFAULT;

switch (owner.type) {
case F_OWNER_TID:
Expand Down Expand Up @@ -332,8 +332,11 @@ static int f_getown_ex(struct file *filp, unsigned long arg)
}
read_unlock(&filp->f_owner.lock);

if (!ret)
if (!ret) {
ret = copy_to_user(owner_p, &owner, sizeof(owner));
if (ret)
ret = -EFAULT;
}
return ret;
}

Expand Down

0 comments on commit 5b54470

Please sign in to comment.