From owner-svn-src-all@FreeBSD.ORG Mon Jan 16 21:40:43 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 2C3C6106566B; Mon, 16 Jan 2012 21:40:43 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) by mx1.freebsd.org (Postfix) with ESMTP id AD0198FC14; Mon, 16 Jan 2012 21:40:42 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 6E69B25D3A47; Mon, 16 Jan 2012 21:40:41 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 8AAE2BD952D; Mon, 16 Jan 2012 21:40:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id xKYsA1bN4sLN; Mon, 16 Jan 2012 21:40:39 +0000 (UTC) Received: from orange-en1.sbone.de (orange-en1.sbone.de [IPv6:fde9:577b:c1a9:31:cabc:c8ff:fecf:e8e3]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 25147BD952F; Mon, 16 Jan 2012 21:40:39 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: "Bjoern A. Zeeb" In-Reply-To: <4F146140.4040203@FreeBSD.org> Date: Mon, 16 Jan 2012 21:40:38 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201201152052.q0FKqVT1099586@svn.freebsd.org> <4F146140.4040203@FreeBSD.org> To: Andriy Gapon X-Mailer: Apple Mail (2.1084) Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Eitan Adler , 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 21:40:43 -0000 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!