From patchwork Mon Jan 3 17:11:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 49483 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 A6E713858422 for ; Mon, 3 Jan 2022 17:12:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6E713858422 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641229930; bh=JhFTVOSnFXbveIGnjeia5+lE27m/WjPLzQPpcwJGLlc=; 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=V1gAq24o+4qbn6/D/Ucp+UNvthMlqT9CMeFLvDcdt6bn6AR159W7EJAJqTa8guoZH saFlG+/yRwa+R/JWQYobxsY8vretO9Rz7ZTEwaqnzuQ//7ukEFj7Kku0JTjlAZYGNO YVoht5TcATChf8jILAaEX/+PtSGCwDekldFY2SmU= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D8C773858422 for ; Mon, 3 Jan 2022 17:11:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8C773858422 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-30-Od8X9HzYPKmEXxvWFfjkIQ-1; Mon, 03 Jan 2022 12:11:13 -0500 X-MC-Unique: Od8X9HzYPKmEXxvWFfjkIQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB19E801962 for ; Mon, 3 Jan 2022 17:11:12 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FBA17EA50 for ; Mon, 3 Jan 2022 17:11:11 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 1/3] elf: Introduce rtld_setup_main_map In-Reply-To: References: X-From-Line: 0a942bd0f7e159ca641cc14f76aa28607cd64da0 Mon Sep 17 00:00:00 2001 Message-Id: <0a942bd0f7e159ca641cc14f76aa28607cd64da0.1641228666.git.fweimer@redhat.com> Date: Mon, 03 Jan 2022 18:11:09 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This function collects most of the processing needed to initialize the link map for the main executable. Reviewed-by: H.J. Lu --- elf/rtld.c | 303 ++++++++++++++++++++++++++++------------------------- 1 file changed, 159 insertions(+), 144 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 24e48bf3fa..ba6e31377d 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1126,17 +1126,172 @@ rtld_chain_load (struct link_map *main_map, char *argv0) rtld_soname, pathname, errcode); } +/* Called to complete the initialization of the link map for the main + executable. Returns true if there is a PT_INTERP segment. */ +static bool +rtld_setup_main_map (struct link_map *main_map) +{ + /* This have already been filled in right after _dl_new_object, or + as part of _dl_map_object. */ + const ElfW(Phdr) *phdr = main_map->l_phdr; + ElfW(Word) phnum = main_map->l_phnum; + + bool has_interp = false; + + main_map->l_map_end = 0; + main_map->l_text_end = 0; + /* Perhaps the executable has no PT_LOAD header entries at all. */ + main_map->l_map_start = ~0; + /* And it was opened directly. */ + ++main_map->l_direct_opencount; + + /* Scan the program header table for the dynamic section. */ + for (const ElfW(Phdr) *ph = phdr; ph < &phdr[phnum]; ++ph) + switch (ph->p_type) + { + case PT_PHDR: + /* Find out the load address. */ + main_map->l_addr = (ElfW(Addr)) phdr - ph->p_vaddr; + break; + case PT_DYNAMIC: + /* This tells us where to find the dynamic section, + which tells us everything we need to do. */ + main_map->l_ld = (void *) main_map->l_addr + ph->p_vaddr; + main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; + break; + case PT_INTERP: + /* This "interpreter segment" was used by the program loader to + find the program interpreter, which is this program itself, the + dynamic linker. We note what name finds us, so that a future + dlopen call or DT_NEEDED entry, for something that wants to link + against the dynamic linker as a shared library, will know that + the shared object is already loaded. */ + _dl_rtld_libname.name = ((const char *) main_map->l_addr + + ph->p_vaddr); + /* _dl_rtld_libname.next = NULL; Already zero. */ + GL(dl_rtld_map).l_libname = &_dl_rtld_libname; + + /* Ordinarilly, we would get additional names for the loader from + our DT_SONAME. This can't happen if we were actually linked as + a static executable (detect this case when we have no DYNAMIC). + If so, assume the filename component of the interpreter path to + be our SONAME, and add it to our name list. */ + if (GL(dl_rtld_map).l_ld == NULL) + { + const char *p = NULL; + const char *cp = _dl_rtld_libname.name; + + /* Find the filename part of the path. */ + while (*cp != '\0') + if (*cp++ == '/') + p = cp; + + if (p != NULL) + { + _dl_rtld_libname2.name = p; + /* _dl_rtld_libname2.next = NULL; Already zero. */ + _dl_rtld_libname.next = &_dl_rtld_libname2; + } + } + + has_interp = true; + break; + case PT_LOAD: + { + ElfW(Addr) mapstart; + ElfW(Addr) allocend; + + /* Remember where the main program starts in memory. */ + mapstart = (main_map->l_addr + + (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1))); + if (main_map->l_map_start > mapstart) + main_map->l_map_start = mapstart; + + /* Also where it ends. */ + allocend = main_map->l_addr + ph->p_vaddr + ph->p_memsz; + if (main_map->l_map_end < allocend) + main_map->l_map_end = allocend; + if ((ph->p_flags & PF_X) && allocend > main_map->l_text_end) + main_map->l_text_end = allocend; + } + break; + + case PT_TLS: + if (ph->p_memsz > 0) + { + /* Note that in the case the dynamic linker we duplicate work + here since we read the PT_TLS entry already in + _dl_start_final. But the result is repeatable so do not + check for this special but unimportant case. */ + main_map->l_tls_blocksize = ph->p_memsz; + main_map->l_tls_align = ph->p_align; + if (ph->p_align == 0) + main_map->l_tls_firstbyte_offset = 0; + else + main_map->l_tls_firstbyte_offset = (ph->p_vaddr + & (ph->p_align - 1)); + main_map->l_tls_initimage_size = ph->p_filesz; + main_map->l_tls_initimage = (void *) ph->p_vaddr; + + /* This image gets the ID one. */ + GL(dl_tls_max_dtv_idx) = main_map->l_tls_modid = 1; + } + break; + + case PT_GNU_STACK: + GL(dl_stack_flags) = ph->p_flags; + break; + + case PT_GNU_RELRO: + main_map->l_relro_addr = ph->p_vaddr; + main_map->l_relro_size = ph->p_memsz; + break; + } + /* Process program headers again, but scan them backwards so + that PT_NOTE can be skipped if PT_GNU_PROPERTY exits. */ + for (const ElfW(Phdr) *ph = &phdr[phnum]; ph != phdr; --ph) + switch (ph[-1].p_type) + { + case PT_NOTE: + _dl_process_pt_note (main_map, -1, &ph[-1]); + break; + case PT_GNU_PROPERTY: + _dl_process_pt_gnu_property (main_map, -1, &ph[-1]); + break; + } + + /* Adjust the address of the TLS initialization image in case + the executable is actually an ET_DYN object. */ + if (main_map->l_tls_initimage != NULL) + main_map->l_tls_initimage + = (char *) main_map->l_tls_initimage + main_map->l_addr; + if (! main_map->l_map_end) + main_map->l_map_end = ~0; + if (! main_map->l_text_end) + main_map->l_text_end = ~0; + if (! GL(dl_rtld_map).l_libname && GL(dl_rtld_map).l_name) + { + /* We were invoked directly, so the program might not have a + PT_INTERP. */ + _dl_rtld_libname.name = GL(dl_rtld_map).l_name; + /* _dl_rtld_libname.next = NULL; Already zero. */ + GL(dl_rtld_map).l_libname = &_dl_rtld_libname; + } + else + assert (GL(dl_rtld_map).l_libname); /* How else did we get here? */ + + return has_interp; +} + static void dl_main (const ElfW(Phdr) *phdr, ElfW(Word) phnum, ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv) { - const ElfW(Phdr) *ph; struct link_map *main_map; size_t file_size; char *file; - bool has_interp = false; unsigned int i; bool prelinked = false; bool rtld_is_main = false; @@ -1350,7 +1505,7 @@ dl_main (const ElfW(Phdr) *phdr, load the program below unless it has a PT_GNU_STACK indicating nonexecutable stack is ok. */ - for (ph = phdr; ph < &phdr[phnum]; ++ph) + for (const ElfW(Phdr) *ph = phdr; ph < &phdr[phnum]; ++ph) if (ph->p_type == PT_GNU_STACK) { GL(dl_stack_flags) = ph->p_flags; @@ -1469,147 +1624,7 @@ dl_main (const ElfW(Phdr) *phdr, information for the program. */ } - main_map->l_map_end = 0; - main_map->l_text_end = 0; - /* Perhaps the executable has no PT_LOAD header entries at all. */ - main_map->l_map_start = ~0; - /* And it was opened directly. */ - ++main_map->l_direct_opencount; - - /* Scan the program header table for the dynamic section. */ - for (ph = phdr; ph < &phdr[phnum]; ++ph) - switch (ph->p_type) - { - case PT_PHDR: - /* Find out the load address. */ - main_map->l_addr = (ElfW(Addr)) phdr - ph->p_vaddr; - break; - case PT_DYNAMIC: - /* This tells us where to find the dynamic section, - which tells us everything we need to do. */ - main_map->l_ld = (void *) main_map->l_addr + ph->p_vaddr; - main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; - break; - case PT_INTERP: - /* This "interpreter segment" was used by the program loader to - find the program interpreter, which is this program itself, the - dynamic linker. We note what name finds us, so that a future - dlopen call or DT_NEEDED entry, for something that wants to link - against the dynamic linker as a shared library, will know that - the shared object is already loaded. */ - _dl_rtld_libname.name = ((const char *) main_map->l_addr - + ph->p_vaddr); - /* _dl_rtld_libname.next = NULL; Already zero. */ - GL(dl_rtld_map).l_libname = &_dl_rtld_libname; - - /* Ordinarilly, we would get additional names for the loader from - our DT_SONAME. This can't happen if we were actually linked as - a static executable (detect this case when we have no DYNAMIC). - If so, assume the filename component of the interpreter path to - be our SONAME, and add it to our name list. */ - if (GL(dl_rtld_map).l_ld == NULL) - { - const char *p = NULL; - const char *cp = _dl_rtld_libname.name; - - /* Find the filename part of the path. */ - while (*cp != '\0') - if (*cp++ == '/') - p = cp; - - if (p != NULL) - { - _dl_rtld_libname2.name = p; - /* _dl_rtld_libname2.next = NULL; Already zero. */ - _dl_rtld_libname.next = &_dl_rtld_libname2; - } - } - - has_interp = true; - break; - case PT_LOAD: - { - ElfW(Addr) mapstart; - ElfW(Addr) allocend; - - /* Remember where the main program starts in memory. */ - mapstart = (main_map->l_addr - + (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1))); - if (main_map->l_map_start > mapstart) - main_map->l_map_start = mapstart; - - /* Also where it ends. */ - allocend = main_map->l_addr + ph->p_vaddr + ph->p_memsz; - if (main_map->l_map_end < allocend) - main_map->l_map_end = allocend; - if ((ph->p_flags & PF_X) && allocend > main_map->l_text_end) - main_map->l_text_end = allocend; - } - break; - - case PT_TLS: - if (ph->p_memsz > 0) - { - /* Note that in the case the dynamic linker we duplicate work - here since we read the PT_TLS entry already in - _dl_start_final. But the result is repeatable so do not - check for this special but unimportant case. */ - main_map->l_tls_blocksize = ph->p_memsz; - main_map->l_tls_align = ph->p_align; - if (ph->p_align == 0) - main_map->l_tls_firstbyte_offset = 0; - else - main_map->l_tls_firstbyte_offset = (ph->p_vaddr - & (ph->p_align - 1)); - main_map->l_tls_initimage_size = ph->p_filesz; - main_map->l_tls_initimage = (void *) ph->p_vaddr; - - /* This image gets the ID one. */ - GL(dl_tls_max_dtv_idx) = main_map->l_tls_modid = 1; - } - break; - - case PT_GNU_STACK: - GL(dl_stack_flags) = ph->p_flags; - break; - - case PT_GNU_RELRO: - main_map->l_relro_addr = ph->p_vaddr; - main_map->l_relro_size = ph->p_memsz; - break; - } - /* Process program headers again, but scan them backwards so - that PT_NOTE can be skipped if PT_GNU_PROPERTY exits. */ - for (ph = &phdr[phnum]; ph != phdr; --ph) - switch (ph[-1].p_type) - { - case PT_NOTE: - _dl_process_pt_note (main_map, -1, &ph[-1]); - break; - case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (main_map, -1, &ph[-1]); - break; - } - - /* Adjust the address of the TLS initialization image in case - the executable is actually an ET_DYN object. */ - if (main_map->l_tls_initimage != NULL) - main_map->l_tls_initimage - = (char *) main_map->l_tls_initimage + main_map->l_addr; - if (! main_map->l_map_end) - main_map->l_map_end = ~0; - if (! main_map->l_text_end) - main_map->l_text_end = ~0; - if (! GL(dl_rtld_map).l_libname && GL(dl_rtld_map).l_name) - { - /* We were invoked directly, so the program might not have a - PT_INTERP. */ - _dl_rtld_libname.name = GL(dl_rtld_map).l_name; - /* _dl_rtld_libname.next = NULL; Already zero. */ - GL(dl_rtld_map).l_libname = &_dl_rtld_libname; - } - else - assert (GL(dl_rtld_map).l_libname); /* How else did we get here? */ + bool has_interp = rtld_setup_main_map (main_map); /* If the current libname is different from the SONAME, add the latter as well. */ From patchwork Mon Jan 3 17:11:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 49484 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 D39723858403 for ; Mon, 3 Jan 2022 17:12:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D39723858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641229977; bh=Hau9jYNvMRGWnrEigXDAYgk+ex/EnqdiWYQdn3Z1L94=; 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=H/bB1yPlGxumID79s0FihXpyMOPPux4yQsiG57N3qaLcQ7yQ/zGDcmvvEBBbNLulY TEZO5W9UemMIA541BsHF63RKER22rt6AmuUil3g34EHE0ILKpencD2QMZKKmQLpnFH zB5YIibjHs6KLbLHHWMT3dMARnmZc9LZl0hyz8gw= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8781A3858404 for ; Mon, 3 Jan 2022 17:11:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8781A3858404 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-444-dEx9MjUFMeO6BzF_QyoNQw-1; Mon, 03 Jan 2022 12:11:18 -0500 X-MC-Unique: dEx9MjUFMeO6BzF_QyoNQw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9698D2F45 for ; Mon, 3 Jan 2022 17:11:17 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFC747ED65 for ; Mon, 3 Jan 2022 17:11:16 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 2/3] elf: Set l_contiguous to 1 for the main map in more cases In-Reply-To: References: X-From-Line: 1c4f55eb03365f9ea7238e7ab4a997802081bf6e Mon Sep 17 00:00:00 2001 Message-Id: <1c4f55eb03365f9ea7238e7ab4a997802081bf6e.1641228666.git.fweimer@redhat.com> Date: Mon, 03 Jan 2022 18:11:14 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" l_contiguous was not initialized at all for the main map and always 0. This commit adds code to check if the LOAD segments are adjacent to each other, and sets l_contiguous accordingly. This helps _dl_find_object because it is more efficient if the main mapping is contiguous. Note that not all (PIE or non-PIE) binaries are contiguous in this way because BFD ld creates executables with LOAD holes: ELF LOAD segments creating holes in the process image on GNU/Linux https://sourceware.org/pipermail/binutils/2022-January/119082.html https://sourceware.org/bugzilla/show_bug.cgi?id=28743 Reviewed-by: H.J. Lu --- elf/rtld.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/elf/rtld.c b/elf/rtld.c index ba6e31377d..53293f5b13 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1144,6 +1144,22 @@ rtld_setup_main_map (struct link_map *main_map) main_map->l_map_start = ~0; /* And it was opened directly. */ ++main_map->l_direct_opencount; + main_map->l_contiguous = 1; + + /* A PT_LOAD segment at an unexpected address will clear the + l_contiguous flag. The ELF specification says that PT_LOAD + segments need to be sorted in in increasing order, but perhaps + not all executables follow this requirement. Having l_contiguous + equal to 1 is just an optimization, so the code below does not + try to sort the segments in case they are unordered. + + There is one corner case in which l_contiguous is not set to 1, + but where it could be set: If a PIE (ET_DYN) binary is loaded by + glibc itself (not the kernel), it is always contiguous due to the + way the glibc loader works. However, the kernel loader may still + create holes in this case, and the code here still uses 0 + conservatively for the glibc-loaded case, too. */ + ElfW(Addr) expected_load_address = 0; /* Scan the program header table for the dynamic section. */ for (const ElfW(Phdr) *ph = phdr; ph < &phdr[phnum]; ++ph) @@ -1207,12 +1223,21 @@ rtld_setup_main_map (struct link_map *main_map) if (main_map->l_map_start > mapstart) main_map->l_map_start = mapstart; + if (main_map->l_contiguous && expected_load_address != 0 + && expected_load_address != mapstart) + main_map->l_contiguous = 0; + /* Also where it ends. */ allocend = main_map->l_addr + ph->p_vaddr + ph->p_memsz; if (main_map->l_map_end < allocend) main_map->l_map_end = allocend; if ((ph->p_flags & PF_X) && allocend > main_map->l_text_end) main_map->l_text_end = allocend; + + /* The next expected address is the page following this load + segment. */ + expected_load_address = ((allocend + GLRO(dl_pagesize) - 1) + & ~(GLRO(dl_pagesize) - 1)); } break; From patchwork Mon Jan 3 17:11:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 49485 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 3C2663858425 for ; Mon, 3 Jan 2022 17:13:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C2663858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641230020; bh=Ik+G7Ce+/WzOOMpI7ITPMAT8Szyk1vqmjcgMh4/No/o=; 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=Xt7aHp9+B6JYYNWjVNPEydwtzgMaTdLT41FeWJN0L6yNp5qwLt0C7lON7qPoNlAn0 Q2pirF6Uh3GjBhm0MjXfR30f5swabICep3tDjPYpkI8ESwVFxkc4bvtaXLd+W0YQfY Hp335nLLyoqxzxvBxa4v7D2dKC9d2ytA1fZYRB0k= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5D2AC3858421 for ; Mon, 3 Jan 2022 17:11:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D2AC3858421 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-122-BcO-X7OuP6mABygor6l2bA-1; Mon, 03 Jan 2022 12:11:22 -0500 X-MC-Unique: BcO-X7OuP6mABygor6l2bA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 045B581CCB5 for ; Mon, 3 Jan 2022 17:11:22 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C89A77E82 for ; Mon, 3 Jan 2022 17:11:21 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 3/3] elf/tst-dl_find_object: Disable subtests for non-contiguous maps (bug 28732) In-Reply-To: References: X-From-Line: 636c6da259e612258791a6e816bfc7bbfed97e3a Mon Sep 17 00:00:00 2001 Message-Id: <636c6da259e612258791a6e816bfc7bbfed97e3a.1641228666.git.fweimer@redhat.com> Date: Mon, 03 Jan 2022 18:11:19 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- elf/tst-dl_find_object.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) Reviewed-by: H.J. Lu diff --git a/elf/tst-dl_find_object.c b/elf/tst-dl_find_object.c index 21cdc0f848..2ad1924088 100644 --- a/elf/tst-dl_find_object.c +++ b/elf/tst-dl_find_object.c @@ -71,19 +71,24 @@ check (void *address, __FILE__, line, address, actual.dlfo_flags, expected->dlfo_flags); } - if (actual.dlfo_flags != expected->dlfo_flags) + if (expected->dlfo_link_map->l_contiguous) { - support_record_failure (); - printf ("%s:%d: error: %p: map start is %p, expected %p\n", - __FILE__, line, - address, actual.dlfo_map_start, expected->dlfo_map_start); - } - if (actual.dlfo_map_end != expected->dlfo_map_end) - { - support_record_failure (); - printf ("%s:%d: error: %p: map end is %p, expected %p\n", - __FILE__, line, - address, actual.dlfo_map_end, expected->dlfo_map_end); + /* If the mappings are not contiguous, the actual and execpted + mappings may differ, so this subtest will not work. */ + if (actual.dlfo_flags != expected->dlfo_flags) + { + support_record_failure (); + printf ("%s:%d: error: %p: map start is %p, expected %p\n", + __FILE__, line, + address, actual.dlfo_map_start, expected->dlfo_map_start); + } + if (actual.dlfo_map_end != expected->dlfo_map_end) + { + support_record_failure (); + printf ("%s:%d: error: %p: map end is %p, expected %p\n", + __FILE__, line, + address, actual.dlfo_map_end, expected->dlfo_map_end); + } } if (actual.dlfo_link_map != expected->dlfo_link_map) {