diff options
author | Dan Carpenter <error27@gmail.com> | 2010-06-03 06:35:42 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-04 17:16:28 -0400 |
commit | 5b54470daded19d83ea2bbf5f6bc12662942cd63 (patch) | |
tree | 93ac73e7eba1231c863903cd814d12f4cb935b1e /fs/fcntl.c | |
parent | 7d683a09990ff095a91b6e724ecee0ff8733274a (diff) |
fcntl: return -EFAULT if copy_to_user fails
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>
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index f74d270ba155..51e11bf5708f 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -274,7 +274,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg) | |||
274 | 274 | ||
275 | ret = copy_from_user(&owner, owner_p, sizeof(owner)); | 275 | ret = copy_from_user(&owner, owner_p, sizeof(owner)); |
276 | if (ret) | 276 | if (ret) |
277 | return ret; | 277 | return -EFAULT; |
278 | 278 | ||
279 | switch (owner.type) { | 279 | switch (owner.type) { |
280 | case F_OWNER_TID: | 280 | case F_OWNER_TID: |
@@ -332,8 +332,11 @@ static int f_getown_ex(struct file *filp, unsigned long arg) | |||
332 | } | 332 | } |
333 | read_unlock(&filp->f_owner.lock); | 333 | read_unlock(&filp->f_owner.lock); |
334 | 334 | ||
335 | if (!ret) | 335 | if (!ret) { |
336 | ret = copy_to_user(owner_p, &owner, sizeof(owner)); | 336 | ret = copy_to_user(owner_p, &owner, sizeof(owner)); |
337 | if (ret) | ||
338 | ret = -EFAULT; | ||
339 | } | ||
337 | return ret; | 340 | return ret; |
338 | } | 341 | } |
339 | 342 | ||