From owner-svn-src-all@FreeBSD.ORG Sun Jan 15 20:53:50 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 DF775106566B; Sun, 15 Jan 2012 20:53:50 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C96ED8FC17; Sun, 15 Jan 2012 20:53:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0FKroMS099657; Sun, 15 Jan 2012 20:53:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0FKroE0099655; Sun, 15 Jan 2012 20:53:50 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201201152053.q0FKroE0099655@svn.freebsd.org> From: Eitan Adler Date: Sun, 15 Jan 2012 20:53:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230160 - stable/9/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: Sun, 15 Jan 2012 20:53:51 -0000 Author: eadler (ports committer) Date: Sun Jan 15 20:53:50 2012 New Revision: 230160 URL: http://svn.freebsd.org/changeset/base/230160 Log: MFC r228343: - Fix ktrace leakage if error is set PR: kern/163098 Approved by: sbruno Modified: stable/9/sys/kern/kern_ktrace.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_ktrace.c ============================================================================== --- stable/9/sys/kern/kern_ktrace.c Sun Jan 15 20:52:31 2012 (r230159) +++ stable/9/sys/kern/kern_ktrace.c Sun Jan 15 20:53:50 2012 (r230160) @@ -476,7 +476,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); }