From owner-svn-src-all@freebsd.org  Sun Jul 29 19:20:13 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E126A105FAF3;
 Sun, 29 Jul 2018 19:20:13 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 95C51718ED;
 Sun, 29 Jul 2018 19:20:13 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7883F19DF0;
 Sun, 29 Jul 2018 19:20:13 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6TJKDcp049992;
 Sun, 29 Jul 2018 19:20:13 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6TJKDpK049991;
 Sun, 29 Jul 2018 19:20:13 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201807291920.w6TJKDpK049991@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sun, 29 Jul 2018 19:20:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336874 - head/sys/compat/freebsd32
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/sys/compat/freebsd32
X-SVN-Commit-Revision: 336874
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jul 2018 19:20:14 -0000

Author: asomers
Date: Sun Jul 29 19:20:13 2018
New Revision: 336874
URL: https://svnweb.freebsd.org/changeset/base/336874

Log:
  freebsd32_getrusage(2): skip freebsd32_rusage_out on error
  
  PR:		230153
  Reported by:	kib
  MFC after:	2 weeks
  X-MFC-With:	336871
  Differential Revision:	https://reviews.freebsd.org/D16500

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c	Sun Jul 29 19:12:06 2018	(r336873)
+++ head/sys/compat/freebsd32/freebsd32_misc.c	Sun Jul 29 19:20:13 2018	(r336874)
@@ -883,9 +883,10 @@ freebsd32_getrusage(struct thread *td, struct freebsd3
 	int error;
 
 	error = kern_getrusage(td, uap->who, &s);
-	freebsd32_rusage_out(&s, &s32);
-	if (error == 0)
+	if (error == 0) {
+		freebsd32_rusage_out(&s, &s32);
 		error = copyout(&s32, uap->rusage, sizeof(s32));
+	}
 	return (error);
 }