From patchwork Tue Apr 11 10:55:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 67626 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 404213858D20 for ; Tue, 11 Apr 2023 10:55:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 404213858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681210553; bh=10uoo6zMKKt+rKItMpMzySiTKvktwN/rcph+HMYpyXc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=qtutLdV0z7Agf1CqC6LP4kMTguhNl9C9rHh5SrT4qIv3Kp0iaRtE0KqOxhLLBACb8 mbcfSeU/Y0K2uJf8IQUhE0yqj+5iLFGehQ0KxCqzIHOf93KUaCIU+4WfyfQzCCeAVr KXI68S6GqDqjN4+DudaPjGQ6sfeVZ6ILGx959tUY= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id B5E323858D20 for ; Tue, 11 Apr 2023 10:55:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5E323858D20 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-hbMI0NjUMcaqRSGbZ4_UCQ-1; Tue, 11 Apr 2023 06:55:47 -0400 X-MC-Unique: hbMI0NjUMcaqRSGbZ4_UCQ-1 Received: by mail-qk1-f198.google.com with SMTP id a13-20020ae9e80d000000b0074a3e98f30dso11742669qkg.6 for ; Tue, 11 Apr 2023 03:55:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681210546; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=10uoo6zMKKt+rKItMpMzySiTKvktwN/rcph+HMYpyXc=; b=cLnDMqEoPtfH2IapGDGQbBMgO0Qhl2UF0KI1gmBNlIT25I+WYi/pN+M7V2+ACv0mCz lY2lDhF0pLGF+r9WpEfkrut+zxQaiIopQevgx6ZhfHRNq8J9PxJKKI1TxUHFk7b70yEw P3VuiQZe5qM0C7djrC/n5l4mkE09A53URNDPYwiUIWGMpR1eg5AqBDL81Gv5Z0ZI6rpP 6/CycgWSpmJIX4zglls8fqC0tkzN4y8SkIUC8lMob6bbL3Y614Mr5bxde2s4ngVL4GEz FxHBK2k2xFBFfeFPDX2jLd7aForMaWegEZ8g7mRorcR1nIXt/Sn3JuMHLp0yvGUx+G7M 3kmQ== X-Gm-Message-State: AAQBX9cKMdIvZve0K/HmbJaOHFZyqg2mMpollSm5WgqBP8UHWfRX3VgP YmupyQeNotc7EZ0SQoMgYDhDoOAH0OVPylbHlKk6XgACQ5B0uzdklqT4zyEekH6ZoG3F15K928z LdgSX9fYutLJdyo+DD+ydzdlm2cn7mgHXcKS4WCDBv3mfJ1GDme63Rz9HZXq11geKeHtuhO/UON zf X-Received: by 2002:a05:622a:11c5:b0:3e3:a298:7928 with SMTP id n5-20020a05622a11c500b003e3a2987928mr16546356qtk.9.1681210546448; Tue, 11 Apr 2023 03:55:46 -0700 (PDT) X-Google-Smtp-Source: AKy350ZTGqrVmN2yahg3GvhDpFT7jsm4lAceVDN2lW6G/ijS35cBWuvpi07ag5gv0mIBAaBkEhpYig== X-Received: by 2002:a05:622a:11c5:b0:3e3:a298:7928 with SMTP id n5-20020a05622a11c500b003e3a2987928mr16546335qtk.9.1681210546035; Tue, 11 Apr 2023 03:55:46 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id v126-20020a379384000000b007460093cccdsm3895276qkd.25.2023.04.11.03.55.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 03:55:45 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 3574E581C7B; Tue, 11 Apr 2023 12:55:43 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] elf-helpers: Don't crash on unexpected ELF file Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Tue, 11 Apr 2023 12:55:43 +0200 Message-ID: <87leiyk7rk.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, When get_soname_of_elf_file is given an unexpected ELF file (e.g, a DWARF file that is at the wrong place in an RPM, for instance) it hits an assert and aborts. Ooops. This patch removes the offending assert from get_soname_of_elf_file. * src/abg-elf-helpers.cc (get_soname_of_elf_file): If the program header we are looking at is not what we expect, just skip it; do not abort. Signed-off-by: Dodji Seketeli --- src/abg-elf-helpers.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc index 8ffeefb3..d47c1c39 100644 --- a/src/abg-elf-helpers.cc +++ b/src/abg-elf-helpers.cc @@ -1521,13 +1521,17 @@ get_soname_of_elf_file(const string& path, string &soname) Elf_Scn* scn = gelf_offscn (elf, phdr->p_offset); GElf_Shdr shdr_mem; GElf_Shdr* shdr = gelf_getshdr (scn, &shdr_mem); + if (!(shdr == NULL || (shdr->sh_type == SHT_DYNAMIC + || shdr->sh_type == SHT_PROGBITS))) + // This program header doesn't look like one we are + // looking for. Skip to the next. + continue; + size_t entsize = (shdr != NULL && shdr->sh_entsize != 0 ? shdr->sh_entsize : gelf_fsize (elf, ELF_T_DYN, 1, EV_CURRENT)); int maxcnt = (shdr != NULL ? shdr->sh_size / entsize : INT_MAX); - ABG_ASSERT (shdr == NULL || (shdr->sh_type == SHT_DYNAMIC - || shdr->sh_type == SHT_PROGBITS)); Elf_Data* data = elf_getdata (scn, NULL); if (data == NULL) break;