svn commit: r230159 - stable/8/sys/kern

[Eitan Adler]

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);
 }