From owner-svn-src-all@FreeBSD.ORG  Fri Mar 25 18:23:11 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 2A5DB106566B;
	Fri, 25 Mar 2011 18:23:11 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A2FB8FC0C;
	Fri, 25 Mar 2011 18:23:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2PINASt089667;
	Fri, 25 Mar 2011 18:23:10 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2PINA4j089665;
	Fri, 25 Mar 2011 18:23:10 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103251823.p2PINA4j089665@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 25 Mar 2011 18:23:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220004 - head/libexec/rtld-elf
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Mar 2011 18:23:11 -0000

Author: avg
Date: Fri Mar 25 18:23:10 2011
New Revision: 220004
URL: http://svn.freebsd.org/changeset/base/220004

Log:
  rtld: eliminate double call to close(2) that may occur in load_object
  
  The second close(2) call resulted in heisenbugs in some multi-threaded
  applications where e.g. dlopen(3) call in one thread could close a file
  descriptor for a file having been opened in other thread concurrently.
  
  My litmus test for this issue was an openoffice.org build.
  
  Reviewed by:	jhb
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Fri Mar 25 18:16:49 2011	(r220003)
+++ head/libexec/rtld-elf/rtld.c	Fri Mar 25 18:23:10 2011	(r220004)
@@ -1633,12 +1633,9 @@ load_object(const char *name, const Obj_
 	free(path);
 	return NULL;
     }
-    for (obj = obj_list->next;  obj != NULL;  obj = obj->next) {
-	if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) {
-	    close(fd);
+    for (obj = obj_list->next;  obj != NULL;  obj = obj->next)
+	if (obj->ino == sb.st_ino && obj->dev == sb.st_dev)
 	    break;
-	}
-    }
     if (obj != NULL) {
 	object_add_name(obj, name);
 	free(path);