svn commit: r228343 - head/sys/kern

[Eitan Adler]

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