Date: Mon, 16 Jan 2012 21:40:38 +0000 From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Andriy Gapon <avg@freebsd.org> Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Eitan Adler <eadler@FreeBSD.org>, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r230159 - stable/8/sys/kern Message-ID: <F2FDFC66-C3D1-4AD6-8F9E-C931A7A60441@FreeBSD.org> In-Reply-To: <4F146140.4040203@FreeBSD.org> References: <201201152052.q0FKqVT1099586@svn.freebsd.org> <4F146140.4040203@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 16. Jan 2012, at 17:41 , Andriy Gapon wrote: > on 15/01/2012 22:52 Eitan Adler said the following: >> Author: eadler (ports committer) >> Date: Sun Jan 15 20:52:31 2012 >> New Revision: 230159 >> URL: http://svn.freebsd.org/changeset/base/230159 >>=20 >> Log: >> MFC r228343: >> - Fix ktrace leakage if error is set >>=20 >> PR: kern/163098 >> Approved by: sbruno >>=20 >> Modified: >> stable/8/sys/kern/kern_ktrace.c >> Directory Properties: >> stable/8/sys/ (props changed) >=20 > Eitan, >=20 > the list of the directory properties changes seems to be too short. > Have you made a common mistake of "cleaning up" the results of svn = merge or do you > have a sparse checkout of sys? Or something else? I think he just uses svn 1.7.x /bz >=20 >> Modified: stable/8/sys/kern/kern_ktrace.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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 =3D &req->ktr_data.ktr_sysret; >> ktp->ktr_code =3D code; >> ktp->ktr_error =3D error; >> - ktp->ktr_retval =3D retval; /* what about val2 ? */ >> + ktp->ktr_retval =3D ((error =3D=3D 0) ? retval: 0); = /* what about val2 ? */ >> ktr_submitrequest(curthread, req); >> } >>=20 >=20 >=20 > --=20 > Andriy Gapon --=20 Bjoern A. Zeeb You have to have visions! It does not matter how good you are. It matters what good you do!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F2FDFC66-C3D1-4AD6-8F9E-C931A7A60441>