From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21758 invoked by alias); 13 Sep 2010 07:41:38 -0000 Received: (qmail 21741 invoked by uid 22791); 13 Sep 2010 07:41:38 -0000 X-SWARE-Spam-Status: No, hits=-6.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 13 Sep 2010 07:41:34 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8D7fWBA008504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 Sep 2010 03:41:32 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8D7fVWE007226 for ; Mon, 13 Sep 2010 03:41:31 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Don't try to free rpath strings allocated during startup X-Yow: When this load is DONE I think I'll wash it AGAIN.. Date: Mon, 13 Sep 2010 07:41:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2010-09/txt/msg00004.txt.bz2 The stub malloc from dl-minimal.c is used during all of startup until ld.so is re-relocated, so the rpath string allocated so far cannot be freed in the freeres routine. Andreas. 2010-09-13 Andreas Schwab * elf/rtld.c (dl_main): Set GLRO(dl_init_all_dirs) just before re-relocationg ld.so. --- elf/rtld.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 80fe0ab..2e266b1 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2287,6 +2287,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", lossage); } + /* Remember the last search directory added at startup, now that + malloc will no longer be the one from dl-minimal.c. */ + GLRO(dl_init_all_dirs) = GL(dl_all_dirs); + if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. -- 1.7.2.2 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."