From patchwork Tue Oct 29 11:46:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1186052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106420-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="kKREep5H"; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="AOx7kDJt"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 472VCt4wKwz9sCJ for ; Tue, 29 Oct 2019 22:46:18 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=hqw y8jurAgh/cSd1Jd94u8HZY4Oh2V/PABONHvZO+konRbr5+xvwkBO/RDEadfvsBq7 kwhDBKV6m3yo7S4MPeTJUnUfNlN3g+QQ4WfBisH272ZB5TMS9saLMxGem2Kjlhm2 Y4vZOOK3qRk+AbYGGadQ/Pv3x1HuRwt+1D9ojNDc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=LYGQ3PfW4 I2+l2iwBaRAOSMT+ik=; b=kKREep5H0kOn/aCZkDm3mdk4wE7SxO63CCpiW/sUi PKU8yt/xC2Y1AVkIkQt7tc/NeViW6ljSLoSuylB1G2rAS1FaegabjC8yLOVzdQ1M VV8WBl0q5NEiUn7oWg+taYp74LxmtS/Lcj8Ik1zpxA1/NYsDiFMwVUeJY4aIrkTC Ik= Received: (qmail 36159 invoked by alias); 29 Oct 2019 11:46:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 36149 invoked by uid 89); 29 Oct 2019 11:46:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572349566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFQQhjb92uJCLafTqfHddbG9+4EpZxcJev6rycJCizE=; b=AOx7kDJtCeG/OqEE7PnEwI3orRFnAKqVA46i3OWPmITuB8uOKOZ05dOuK7q8QoSEu0+Elq 5pmo00ST4t/DrofAFQSvmhAmb6iacf9kL0WeExhgDKTqlysjRyQ6hGOsLhbpjOKeKd9Jbi 7XL+8M+Lege0VgMnwJ98dIicDXIJoEQ= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] Clarify purpose of assert in _dl_lookup_symbol_x Date: Tue, 29 Oct 2019 12:46:01 +0100 Message-ID: <87eeyv4vwm.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 ----- elf/dl-lookup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index fd44cd4101..aaaf43799e 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -792,11 +792,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, bump_num_relocations (); - /* No other flag than DL_LOOKUP_ADD_DEPENDENCY or DL_LOOKUP_GSCOPE_LOCK - is allowed if we look up a versioned symbol. */ - assert (version == NULL - || (flags & ~(DL_LOOKUP_ADD_DEPENDENCY | DL_LOOKUP_GSCOPE_LOCK)) - == 0); + /* DL_LOOKUP_RETURN_NEWEST does not make sense for versioned + lookups. */ + assert (version == NULL || !(flags & DL_LOOKUP_RETURN_NEWEST)); size_t i = 0; if (__glibc_unlikely (skip_map != NULL))