Skip to content

Commit d5fb96b

Browse files
Al Virogregkh
authored andcommitted
osf_wait4(): fix infoleak
commit a8c39544a6eb2093c04afd5005b6192bd0e880c6 upstream. failing sys_wait4() won't fill struct rusage... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e07db0d commit d5fb96b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/alpha/kernel/osf_sys.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,10 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,
11881188
if (!access_ok(VERIFY_WRITE, ur, sizeof(*ur)))
11891189
return -EFAULT;
11901190

1191-
err = 0;
1192-
err |= put_user(status, ustatus);
1191+
err = put_user(status, ustatus);
1192+
if (ret < 0)
1193+
return err ? err : ret;
1194+
11931195
err |= __put_user(r.ru_utime.tv_sec, &ur->ru_utime.tv_sec);
11941196
err |= __put_user(r.ru_utime.tv_usec, &ur->ru_utime.tv_usec);
11951197
err |= __put_user(r.ru_stime.tv_sec, &ur->ru_stime.tv_sec);

0 commit comments

Comments
 (0)