From patchwork Fri Mar 12 08:23:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42490 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 C8CCE3939C36; Fri, 12 Mar 2021 08:23:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8CCE3939C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615537431; bh=0tPf3UjjN6+zEdWZPvbBCiLlcLCQcbWUAd3umaAS35M=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=E3+Dx1ZEQop+0y/tG76hiAjIWYrs/QGGSxK69gzINZfS2Lq2L+IIp/+OvFuaUP2kw eCeFV3dy7AJUgl8aT6IyUNX5EcOYDKPkNunwk7w8poffJeK/BTFqp3LtG4x+a0OHdU wM/kcIDtSIZMFLM7VeLRpy5sUyXr3vI6jzjkQ99o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 7CD343938C24 for ; Fri, 12 Mar 2021 08:23:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7CD343938C24 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-439-y2sDY9HVMQy-0TCdEi_utw-1; Fri, 12 Mar 2021 03:23:46 -0500 X-MC-Unique: y2sDY9HVMQy-0TCdEi_utw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DB0A1898280 for ; Fri, 12 Mar 2021 08:23:45 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-77.ams2.redhat.com [10.36.112.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6A835D9F2 for ; Fri, 12 Mar 2021 08:23:44 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 2/3] glibcymbols.read_abilist: Add check for duplicate symbols In-Reply-To: References: Message-Id: Date: Fri, 12 Mar 2021 09:23:56 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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_LOW, 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" This detects some bogus abilist files. Reviewed-by: Adhemerval Zanella --- scripts/glibcsymbols.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/glibcsymbols.py b/scripts/glibcsymbols.py index e329ead7f2..1bdd19e51e 100644 --- a/scripts/glibcsymbols.py +++ b/scripts/glibcsymbols.py @@ -63,7 +63,10 @@ def read_abilist(path): with open(path) as inp: for line in inp: version, symbol, flags = line.strip().split(' ', 2) - result[VersionedSymbol(symbol, version)] = flags + versym = VersionedSymbol(symbol, version) + if versym in result: + raise IOError("{}: duplicate symbol {}".format(path, versym)) + result[versym] = flags return result def abilist_lines(symbols):