From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 08:52:39 +0000 (+0200)
Subject: [PATCH] Check return value of copy_to_user in compat_sys_pselect7
X-Git-Tag: v2.6.19-rc1~1077^2~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758333458aa719bfc26ec16eafd4ad3a9e96014d;p=linux-2.6

[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>
---

diff --git a/fs/compat.c b/fs/compat.c
index e31e9cf966..ce982f6e8c 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) {