diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 12:52:39 +0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 12:52:39 +0400 |
| commit | 758333458aa719bfc26ec16eafd4ad3a9e96014d (patch) | |
| tree | 84e4995b4e61b73ac1e235ea1554c75907ab08c4 /fs/compat.c | |
| parent | 95912008ba1fb9d0677c1ce5930aeb0e85ba5710 (diff) | |
| download | linux-758333458aa719bfc26ec16eafd4ad3a9e96014d.tar.xz | |
[PATCH] Check return value of copy_to_user in compat_sys_pselect7
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>
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c index e31e9cf96647..ce982f6e8c80 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -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; @@ -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) { |