From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 15 20:52:31 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB2661065688;
	Sun, 15 Jan 2012 20:52:31 +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 93F108FC1B;
	Sun, 15 Jan 2012 20:52:31 +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 q0FKqV8P099588;
	Sun, 15 Jan 2012 20:52:31 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FKqVT1099586;
	Sun, 15 Jan 2012 20:52:31 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201152052.q0FKqVT1099586@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 15 Jan 2012 20:52:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230159 - stable/8/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 20:52:31 -0000

Author: eadler (ports committer)
Date: Sun Jan 15 20:52:31 2012
New Revision: 230159
URL: http://svn.freebsd.org/changeset/base/230159

Log:
  MFC r228343:
  	 - Fix ktrace leakage if error is set
  
  PR:		kern/163098
  Approved by:	sbruno

Modified:
  stable/8/sys/kern/kern_ktrace.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/kern/kern_ktrace.c
==============================================================================
--- stable/8/sys/kern/kern_ktrace.c	Sun Jan 15 20:52:01 2012	(r230158)
+++ stable/8/sys/kern/kern_ktrace.c	Sun Jan 15 20:52:31 2012	(r230159)
@@ -473,7 +473,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);
 }