From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 25 10:29:22 2011 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E21AA1065672; Fri, 25 Nov 2011 10:29:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D10588FC18; Fri, 25 Nov 2011 10:29:22 +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 pAPATMEs038172; Fri, 25 Nov 2011 10:29:22 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAPATM8M038170; Fri, 25 Nov 2011 10:29:22 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201111251029.pAPATM8M038170@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 25 Nov 2011 10:29:22 +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: r227965 - stable/9/libexec/rtld-elf X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2011 10:29:23 -0000 Author: kib Date: Fri Nov 25 10:29:22 2011 New Revision: 227965 URL: http://svn.freebsd.org/changeset/base/227965 Log: MFC r227660: Fix fd leak. Approved by: re (bz) Modified: stable/9/libexec/rtld-elf/rtld.c Directory Properties: stable/9/libexec/rtld-elf/ (props changed) Modified: stable/9/libexec/rtld-elf/rtld.c ============================================================================== --- stable/9/libexec/rtld-elf/rtld.c Fri Nov 25 09:46:36 2011 (r227964) +++ stable/9/libexec/rtld-elf/rtld.c Fri Nov 25 10:29:22 2011 (r227965) @@ -1657,6 +1657,7 @@ load_object(const char *name, const Obj_ } if (flags & RTLD_LO_NOLOAD) { free(path); + close(fd); return (NULL); }