svn commit: r230158 - stable/7/sys/kern
Eitan Adler
eadler at FreeBSD.org
Sun Jan 15 20:52:02 UTC 2012
Author: eadler (ports committer)
Date: Sun Jan 15 20:52:01 2012
New Revision: 230158
URL: http://svn.freebsd.org/changeset/base/230158
Log:
MFC r228343:
- Fix ktrace leakage if error is set
PR: kern/163098
Approved by: sbruno
Modified:
stable/7/sys/kern/kern_ktrace.c
Directory Properties:
stable/7/sys/ (props changed)
Modified: stable/7/sys/kern/kern_ktrace.c
==============================================================================
--- stable/7/sys/kern/kern_ktrace.c Sun Jan 15 20:43:39 2012 (r230157)
+++ stable/7/sys/kern/kern_ktrace.c Sun Jan 15 20:52:01 2012 (r230158)
@@ -462,7 +462,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);
}
More information about the svn-src-stable-7
mailing list