From patchwork Mon Jan 3 23:04:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1574911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=luruM5xg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JSWbW2WTKz9sRR for ; Tue, 4 Jan 2022 10:07:03 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C4FE33858421 for ; Mon, 3 Jan 2022 23:07:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4FE33858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641251220; bh=xG7OKtw+NZur35Gu3Ttd2uOfipnl1Qc9lUj6gkJ08nU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=luruM5xgwGGFYLHWWZtKHvTOY84WKK0a5w3RQEr3oC51DnsnOIcpRujDnNMYBs4b3 p19dmrPceEtJb0a93L1ZwlMH6rY9ziRcDO3FpPeSWsLbd0xeZA/Vvg2F/IoZliulkC KpglTkwr2SlOEqALvg4rIemeouiMdHKsjVrmRGAA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id EBAB4385840E for ; Mon, 3 Jan 2022 23:04:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EBAB4385840E Received: by mail-pj1-x1034.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so1229475pjp.0 for ; Mon, 03 Jan 2022 15:04:37 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xG7OKtw+NZur35Gu3Ttd2uOfipnl1Qc9lUj6gkJ08nU=; b=R7aTtxyN7E+47UAHNnFQlvxGRGfZPLDb9eVNcxZil+LG4vdB6oUwDb3J8StiyACzNR 7c+8rucPEvxBQORw5LA4XRPH3/TghlWWdGb46vtuk7j+77uHqqRFIN1JWeY/p0wcFNtj IVLY9bWrkSnd1/sy2AtQrygV4n0UsKZE676i5904FMehnus6rLFmsFvbSLs+hKaI0mu8 gsHJG+CNc5BlSZqsFuxvQ5WcksWOJ3Yp+bEowyv8b5jxV42DmUsbQERkCk4YmdyeyzFr sY/1X599pWFjnpN84U3IE0TLKXPKU/zTvL3E7gF6j4AXkLmqsdkcfGcvyxu+58t4Z5ww DA2Q== X-Gm-Message-State: AOAM532ormN/lMp10Wj6Fy9IInIva/+jDLCrroIC6cceVVYDOFByXhkg ZEmsZu7yeK7AMorDF89SHGU= X-Google-Smtp-Source: ABdhPJyMZ7UFle2ncMET46YzrLeDo8nWFuW0MJW2k5ORGqOeCoPcB/fyUTAiIgBj897A0fBrAJ3/4A== X-Received: by 2002:a17:902:be15:b0:149:a608:7098 with SMTP id r21-20020a170902be1500b00149a6087098mr18782761pls.63.1641251076712; Mon, 03 Jan 2022 15:04:36 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id f14sm40413368pfv.215.2022.01.03.15.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 15:04:35 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.42]) by gnu-tgl-3.localdomain (Postfix) with ESMTPS id A765FC08CE; Mon, 3 Jan 2022 15:04:34 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 88DDC300437; Mon, 3 Jan 2022 15:04:33 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v7 2/4] elf: Add a test for PT_LOAD segments with mixed p_align [BZ #28676] Date: Mon, 3 Jan 2022 15:04:31 -0800 Message-Id: <20220103230433.1907240-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103230433.1907240-1-hjl.tools@gmail.com> References: <20220103230433.1907240-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3029.0 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" Cc: Florian Weimer Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Add tst-p_alignmod1-edit to edit the copy of tst-alignmod3.so to reduce p_align of the first PT_LOAD segment by half and verify that the shared library is mapped with the maximum p_align of all PT_LOAD segments. --- elf/Makefile | 18 ++++++ elf/tst-elf-edit.h | 126 +++++++++++++++++++++++++++++++++++++ elf/tst-p_align1.c | 27 ++++++++ elf/tst-p_alignmod1-edit.c | 34 ++++++++++ 4 files changed, 205 insertions(+) create mode 100644 elf/tst-elf-edit.h create mode 100644 elf/tst-p_align1.c create mode 100644 elf/tst-p_alignmod1-edit.c diff --git a/elf/Makefile b/elf/Makefile index 883578ee36..9c831faac1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -403,6 +403,13 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-dl_find_object-mod8 \ tst-dl_find_object-mod9 \ +ifeq (yes,$(build-shared)) +tests += \ + tst-p_alignmod1-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%,\ @@ -2079,3 +2086,14 @@ CFLAGS-tst-dl_find_object-mod6.c += -funwind-tables CFLAGS-tst-dl_find_object-mod7.c += -funwind-tables CFLAGS-tst-dl_find_object-mod8.c += -funwind-tables CFLAGS-tst-dl_find_object-mod9.c += -funwind-tables + +$(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-p_alignmod1-edit \ + $(objpfx)tst-alignmod3.so + rm -f $@ + cp $(objpfx)tst-alignmod3.so $@ + $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ + $(objpfx)tst-p_alignmod1-edit $@ diff --git a/elf/tst-elf-edit.h b/elf/tst-elf-edit.h new file mode 100644 index 0000000000..ce98cf012c --- /dev/null +++ b/elf/tst-elf-edit.h @@ -0,0 +1,126 @@ +/* Update 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 + +const char *file_name; + +static size_t update_p_align (size_t); + +int +main (int argc, char ** argv) +{ + if (argc != 2) + { + printf ("Usage: %s: file\n", argv[0]); + return 0; + } + + 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); + } + + 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) + { + /* Update p_align of the first PT_LOAD segment. */ + phdr->p_align = update_p_align (phdr->p_align); + break; + } + + munmap (base, statbuf.st_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 diff --git a/elf/tst-p_alignmod1-edit.c b/elf/tst-p_alignmod1-edit.c new file mode 100644 index 0000000000..2aa0e7ccdd --- /dev/null +++ b/elf/tst-p_alignmod1-edit.c @@ -0,0 +1,34 @@ +/* Reduce p_align of the first PT_LOAD segment by half. + 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 "tst-elf-edit.h" + +/* Reduce p_align by half. */ + +static size_t +update_p_align (size_t p_align) +{ + size_t pagesize = sysconf (_SC_PAGESIZE); + size_t new_p_align = p_align >> 1; + + if (new_p_align < pagesize) + error (1, 0, "%s: new p_align (0x%zx) < page size (0x%zx)", + file_name, new_p_align, pagesize); + + return new_p_align; +}