Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fcntl: return -EFAULT if copy_to_user fails

Browse source 
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>
This commit is contained in:
Dan Carpenter 2010-06-03 12:35:42 +02:00 committed by Al Viro
parent 7d683a0999
commit 5b54470dad
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/fcntl.c
View file

@ -274,7 +274,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
ret = copy_from_user(&owner, owner_p, sizeof(owner)); ret = copy_from_user(&owner, owner_p, sizeof(owner));
if (ret) if (ret)
return ret; return -EFAULT;
switch (owner.type) { switch (owner.type) {
case F_OWNER_TID: case F_OWNER_TID:
@ -332,8 +332,11 @@ static int f_getown_ex(struct file *filp, unsigned long arg)
} }
read_unlock(&filp->f_owner.lock); read_unlock(&filp->f_owner.lock);
if (!ret) if (!ret) {
ret = copy_to_user(owner_p, &owner, sizeof(owner)); ret = copy_to_user(owner_p, &owner, sizeof(owner));
if (ret)
ret = -EFAULT;
}
return ret; return ret;
} }