---

yaml --- r: 348922 b: refs/heads/master c: a566c28 h: refs/heads/master v: v3
git-mirror · Dec 26, 2012 · c039c83 · c039c83
1 parent 38ea4ff
commit c039c83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9807b109497ca41d363dc7b6ff2bb6c0d52524
+refs/heads/master: a566c288826ad4502e43b59570214f18173d7744
diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c
@@ -587,7 +587,11 @@ COMPAT_SYSCALL_DEFINE5(waitid,
 		return ret;
 
 	if (uru) {
-		ret = put_compat_rusage(&ru, uru);
+		/* sys_waitid() overwrites everything in ru */
+		if (COMPAT_USE_64BIT_TIME)
+			ret = copy_to_user(uru, &ru, sizeof(ru));
+		else
+			ret = put_compat_rusage(&ru, uru);
 		if (ret)
 			return ret;
 	}