From patchwork Wed Jun 3 13:43:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39435 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D0C15388A802; Wed, 3 Jun 2020 13:44:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D0C15388A802 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591191844; bh=WcK39xk9ybO47PeQFslZdLD6krFvvtURlqLeBSLi2Ks=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=IXmgUUB+RJw72cag+Q3aYKwrE0+XrrAA6lIUD2HjzKQ768pj9nLUfqfK+oET1MXjI 23DKUX/xcEOitQ0JMezZ5+tfkgs/s3+oEQGR7fjTun12jDbmY2kiHmqL716BilszK7 ICGenYYihh37MvY/fE9iJaGSv8oUp4F5NPEEsuWo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 002CE383E826 for ; Wed, 3 Jun 2020 13:44:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 002CE383E826 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-_YgKbKRMNM6vSnHoeCDNlA-1; Wed, 03 Jun 2020 09:44:01 -0400 X-MC-Unique: _YgKbKRMNM6vSnHoeCDNlA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4829491164 for ; Wed, 3 Jun 2020 13:44:00 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-181.ams2.redhat.com [10.36.112.181]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BFBC7100164C for ; Wed, 3 Jun 2020 13:43:59 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] elf: Fix dlclose of an empty namespace in auditing mode (bug 26076) Date: Wed, 03 Jun 2020 15:43:58 +0200 Message-ID: <87zh9kuuw1.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" ns->_ns_loaded is NULL if nothing has been loaded into the namespace. It seems difficult to hit this bug reliably, so this change does not come with a test case. It was trigger by accident, due to TLS exhaustion. --- elf/dl-close.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elf/dl-close.c b/elf/dl-close.c index 73b2817bbf..896e59e42e 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -782,7 +782,7 @@ _dl_close_worker (struct link_map *map, bool force) { struct link_map *head = ns->_ns_loaded; /* Do not call the functions for any auditing object. */ - if (head->l_auditing == 0) + if (head != NULL && head->l_auditing == 0) { struct audit_ifaces *afct = GLRO(dl_audit); for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)