X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fcompat.c;h=ce982f6e8c80270be3fd23f8f9553c486626986e;hb=065d312e15902976d256ddaf396a7950ec0350a8;hp=e31e9cf966475dd27b1aa206437b4330e80a0d70;hpb=f6e6e883730aff2718610d3eba7608fcf73328ed;p=powerpc.git

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) {