From owner-svn-src-all@FreeBSD.ORG Mon Jan 16 17:41:23 2012 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A30611065673; Mon, 16 Jan 2012 17:41:23 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 10A268FC14; Mon, 16 Jan 2012 17:41:21 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id TAA24002; Mon, 16 Jan 2012 19:41:20 +0200 (EET) (envelope-from avg@FreeBSD.org) Message-ID: <4F146140.4040203@FreeBSD.org> Date: Mon, 16 Jan 2012 19:41:20 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:8.0) Gecko/20111109 Thunderbird/8.0 MIME-Version: 1.0 To: Eitan Adler References: <201201152052.q0FKqVT1099586@svn.freebsd.org> In-Reply-To: <201201152052.q0FKqVT1099586@svn.freebsd.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r230159 - stable/8/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2012 17:41:23 -0000 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 > > 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) Eitan, 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? > 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); > } > -- Andriy Gapon