Skip to content

Commit

Permalink
[PATCH] Check return value of copy_to_user in compat_sys_pselect7
Browse files Browse the repository at this point in the history
Fix

linux/fs/compat.c: In function compat_sys_pselect7
linux/fs/compat.c:1869: warning: ignoring return value of copy_to_user, declared with attribute warn_unused_result

To make it easier to handle I changed to semantics to not try to
write out a timespec if an error occurred. I hope that's ok.

Cc: dwmw2@infradead.org

Signed-off-by: Andi Kleen <ak@suse.de>
  • Loading branch information
Andi Kleen authored and Andi Kleen committed Sep 26, 2006
1 parent 9591200 commit 7583334
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,7 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,

} while (!ret && !timeout && tsp && (ts.tv_sec || ts.tv_nsec));

if (tsp && !(current->personality & STICKY_TIMEOUTS)) {
if (ret == 0 && tsp && !(current->personality & STICKY_TIMEOUTS)) {
struct compat_timespec rts;

rts.tv_sec = timeout / HZ;
Expand All @@ -1866,7 +1866,8 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
}
if (compat_timespec_compare(&rts, &ts) >= 0)
rts = ts;
copy_to_user(tsp, &rts, sizeof(rts));
if (copy_to_user(tsp, &rts, sizeof(rts)))
ret = -EFAULT;
}

if (ret == -ERESTARTNOHAND) {
Expand Down

0 comments on commit 7583334

Please sign in to comment.