From owner-svn-src-all@FreeBSD.ORG  Thu Dec  8 03:20:39 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56ABA1065672;
	Thu,  8 Dec 2011 03:20:39 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 468058FC0C;
	Thu,  8 Dec 2011 03:20:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB83KdeA068177;
	Thu, 8 Dec 2011 03:20:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB83KdkV068175;
	Thu, 8 Dec 2011 03:20:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201112080320.pB83KdkV068175@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 8 Dec 2011 03:20:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228343 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Dec 2011 03:20:39 -0000

Author: eadler (ports committer)
Date: Thu Dec  8 03:20:38 2011
New Revision: 228343
URL: http://svn.freebsd.org/changeset/base/228343

Log:
  - Fix ktrace leakage if error is set
  
  PR:		kern/163098
  Submitted by:	Loganaden Velvindron <loganaden@devio.us>
  Approved by:	sbruno@
  MFC after:	1 month

Modified:
  head/sys/kern/kern_ktrace.c

Modified: head/sys/kern/kern_ktrace.c
==============================================================================
--- head/sys/kern/kern_ktrace.c	Thu Dec  8 02:40:46 2011	(r228342)
+++ head/sys/kern/kern_ktrace.c	Thu Dec  8 03:20:38 2011	(r228343)
@@ -478,7 +478,7 @@ ktrsysret(code, error, retval)
 	ktp = &req->ktr_data.ktr_sysret;
 	ktp->ktr_code = code;
 	ktp->ktr_error = error;
-	ktp->ktr_retval = retval;		/* what about val2 ? */
+	ktp->ktr_retval = ((error == 0) ? retval: 0);		/* what about val2 ? */
 	ktr_submitrequest(curthread, req);
 }