From patchwork Tue Dec 21 15:07:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 49149 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 F2DE3385801F for ; Tue, 21 Dec 2021 15:07:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2DE3385801F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640099249; bh=JwMtqWuLeCInita/UHZ4/2c23U/VtELWxrodZLUgtr4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=GucMtF0xGd+EEO628mk/44lg6wuqcu2ziNje4xOtJi1pVUfJUl9qCRuEvfUYU+3x0 LyRdQ6Nr4wO9RfpyyF6jhWdXzrY44WsJjDsHoQKqNFc9YSZtSAQ1A7kDDp2nh5/laO Oo8S2/FfSygKn+s0v5QQC5V3SbrLnKyiCtp+fNA0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id 10F9F3858C2C for ; Tue, 21 Dec 2021 15:07:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 10F9F3858C2C Received: by mail-pj1-x102b.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so3506062pjp.0 for ; Tue, 21 Dec 2021 07:07:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JwMtqWuLeCInita/UHZ4/2c23U/VtELWxrodZLUgtr4=; b=xtit/3hK1gfo/I3vJi7RF20E5EKOhIov79TsRWcGmYzbUCz4sB7eaRpv0wqa/DXRDQ 3TlulNaybzJ5LBVek9tb/CSFo1BVCBbeHFXOs8+VxkRw9D4qBXLSFe9cNdHziRVbeTOg ss50I1rRyy/Xc+ign8fcgYz4zEg4rfxC75qLVyFZSTxPZUgujbJCTGOfde6bfLZ4SFJ9 rjmw4nM/YOn0tvy5fX/rLmKEbtNRfMEUm/UoGqRdhaQdtWoJ20qaZxd91I0YfRO5lX3t MJp+zN8oHvcIN9d4M5xbxovjKGtkkfpx+T/Zw9B5uhDrCVdUPyD6IdSiBIZxFUGat6iq DHtw== X-Gm-Message-State: AOAM533fk09NS3VJrcEBHREzYqdsNaNYBbs7MdDBeg3DWtyX4PZz6cU4 TD/pmJi+zmhBzslYeVVo0uGeFv+pbjY= X-Google-Smtp-Source: ABdhPJybq5tkzdToMNWDRAxVybKQ9Pnc03CYSii/o0mhBIC1HUbKY7B3t3JHeNRAWNCMCQ/mUVPwdA== X-Received: by 2002:a17:902:db07:b0:149:a80:1070 with SMTP id m7-20020a170902db0700b001490a801070mr3527577plx.27.1640099222746; Tue, 21 Dec 2021 07:07:02 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id f21sm23280996pfc.191.2021.12.21.07.07.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 07:07:02 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.42]) by gnu-tgl-3.localdomain (Postfix) with ESMTPS id 4AC92C0192 for ; Tue, 21 Dec 2021 07:07:01 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 347AE3003DB for ; Tue, 21 Dec 2021 07:07:00 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v4 2/2] elf: Add a test for PT_LOAD segments with mixed p_align [BZ #28676] Date: Tue, 21 Dec 2021 07:07:00 -0800 Message-Id: <20211221150700.1595916-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221150700.1595916-1-hjl.tools@gmail.com> References: <20211221150700.1595916-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3029.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Add tst-alignmod3-edit to edit the copy of tst-alignmod3.so to lower p_align of the first PT_LOAD segment and verify that the shared library is mapped with the maximum p_align of all PT_LOAD segments. --- elf/Makefile | 18 ++++++ elf/tst-alignmod3-edit.c | 130 +++++++++++++++++++++++++++++++++++++++ elf/tst-p_align1.c | 27 ++++++++ 3 files changed, 175 insertions(+) create mode 100644 elf/tst-alignmod3-edit.c create mode 100644 elf/tst-p_align1.c diff --git a/elf/Makefile b/elf/Makefile index fe42caeb0e..c3402c65b2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -378,6 +378,13 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-auditmod18 \ tst-audit18mod \ +ifeq (yesyes,$(build-shared)$(run-built-tests)) +tests += \ + tst-alignmod3-edit \ + tst-p_align1 \ + +endif + # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ @@ -1995,3 +2002,14 @@ $(objpfx)tst-ro-dynamic-mod.so: $(objpfx)tst-ro-dynamic-mod.os \ $(objpfx)tst-ro-dynamic-mod.os $(objpfx)tst-rtld-run-static.out: $(objpfx)/ldconfig + +$(objpfx)tst-p_align1: $(objpfx)tst-p_alignmod1.so + +# Make a copy of tst-alignmod3.so and lower p_align of the first PT_LOAD +# segment. +$(objpfx)tst-p_alignmod1.so: $(objpfx)tst-alignmod3-edit \ + $(objpfx)tst-alignmod3.so + rm -f $@ + cp $(objpfx)tst-alignmod3.so $@ + $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ + $(objpfx)tst-alignmod3-edit $@ diff --git a/elf/tst-alignmod3-edit.c b/elf/tst-alignmod3-edit.c new file mode 100644 index 0000000000..c0ac6cdc26 --- /dev/null +++ b/elf/tst-alignmod3-edit.c @@ -0,0 +1,130 @@ +/* Lower p_align of the first PT_LOAD segment. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +main (int argc, char ** argv) +{ + if (argc != 2) + { + printf ("Usage: %s: file\n", argv[0]); + return 0; + } + + const char *file_name = argv[1]; + struct stat statbuf; + int errno_saved; + + if (stat (file_name, &statbuf) < 0) + error (1, errno, "%s: not exist", file_name); + + ElfW(Ehdr) *ehdr; + + if (statbuf.st_size < sizeof (*ehdr)) + error (1, 0, "%s: too small", file_name); + + int fd = open (file_name, O_RDWR); + if (fd < 0) + error (1, errno, "%s: can't open", file_name); + + /* Map in the whole file. */ + void *base = mmap (NULL, statbuf.st_size, PROT_READ | PROT_WRITE, + MAP_SHARED, fd, 0); + if (base == MAP_FAILED) + { + errno_saved = errno; + close (fd); + error (1, errno_saved, "%s: failed to map", file_name); + } + + ehdr = (ElfW(Ehdr) *) base; + if (ehdr->e_ident[EI_MAG0] != ELFMAG0 + || ehdr->e_ident[EI_MAG1] != ELFMAG1 + || ehdr->e_ident[EI_MAG2] != ELFMAG2 + || ehdr->e_ident[EI_MAG3] != ELFMAG3) + { + close (fd); + error (1, 0, "%s: bad ELF header", file_name); + } + + if (ehdr->e_type != ET_DYN) + { + close (fd); + error (1, 0, "%s: not shared library", file_name); + } + + bool unsupported_class = true; + switch (ehdr->e_ident[EI_CLASS]) + { + default: + break; + + case ELFCLASS32: + unsupported_class = __ELF_NATIVE_CLASS != 32; + break; + + case ELFCLASS64: + unsupported_class = __ELF_NATIVE_CLASS != 64; + break; + } + + if (unsupported_class) + { + close (fd); + error (1, 0, "%s: unsupported ELF class: %d", + file_name, ehdr->e_ident[EI_CLASS]); + } + + size_t phdr_size = sizeof (ElfW(Phdr)) * ehdr->e_phentsize; + if (statbuf.st_size < (ehdr->e_phoff + phdr_size)) + { + close (fd); + error (1, 0, "%s: too small", file_name); + } + + size_t pagesize = sysconf (_SC_PAGESIZE); + + ElfW(Phdr) *phdr = (ElfW(Phdr) *) (base + ehdr->e_phoff); + for (int i = 0; i < ehdr->e_phnum; i++, phdr++) + if (phdr->p_type == PT_LOAD) + { + /* Reduce p_align of the first PT_LOAD segment by half. */ + if ((phdr->p_align >> 1) < pagesize) + { + close (fd); + error (1, 0, "%s: p_align (0x%zx) < 2 * page size (0x%zx)", + file_name, phdr->p_align, 2 * pagesize); + } + phdr->p_align >>= 1; + break; + } + + munmap (base, phdr_size); + close (fd); + + return 0; +} diff --git a/elf/tst-p_align1.c b/elf/tst-p_align1.c new file mode 100644 index 0000000000..cab9793220 --- /dev/null +++ b/elf/tst-p_align1.c @@ -0,0 +1,27 @@ +/* Check different alignments of PT_LOAD segments in a shared library. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +extern int do_load_test (void); + +static int +do_test (void) +{ + return do_load_test (); +} + +#include