From patchwork Tue Jan 18 21:57:30 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: 50195 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 7EA543858D39 for ; Tue, 18 Jan 2022 21:57:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EA543858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1642543075; bh=qu75BYjAM0FEwGdjVy9rhWuoJzlVSdTlPeliRepZhws=; 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=NMHWNiis7sCAPrxGIqRKEfE7XuKPL+WqDjVQYYoUGIjlGXk/lh8YrN6GsRjWOPW50 j4jXrQULrPdiEgE94ntW2VeRrKg5DWG1rRdoeTq6t7JwRfMjSERe4IXF3LyMfUyAEm diTxzDFPjOW4FzEDBwAlrZiwxvCGy/FnXniZ28m0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id C41FD3858D39 for ; Tue, 18 Jan 2022 21:57:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C41FD3858D39 Received: by mail-pf1-x432.google.com with SMTP id x83so654659pfc.0 for ; Tue, 18 Jan 2022 13:57:34 -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=qu75BYjAM0FEwGdjVy9rhWuoJzlVSdTlPeliRepZhws=; b=zebeBE2mr6T9LcABLd5IH1q/0/BqOU52o6v6Cjxq0iGpY001YqocAZPOJpYwTwbpt7 yuL+y0mQXOSwgdU3HTewOkuDNinjRsYoufQANBal/UhXqICpGFBZXhTAuOeJH49+5Xy+ JNppFWsRjKOSkhBPUR8AqNqrwOMuPLmCVOerLdvFm4inM2N0s7u+AF9kzqVwGyEOeuS1 n4MpBW6gOVRPYZGN//jpyTx6nbxy8R1Zyh3u3xSDYWkGnKYOq/Pz3UxzXrBRPkFeb2Fj tQk8aYIY4tRR9dfj+Ju9vRbo1Cof6bbGjTZG6WpG5b5egzo7D3Uzh9jGm4O0yeGkjzU7 hqUg== X-Gm-Message-State: AOAM5301uBeYGdz3ij/7AAvdNQtZrgNUgiqVqQUiFFB3JQw/R/RPlMwd bpPho64fQZszo4ckgrQT27E= X-Google-Smtp-Source: ABdhPJyBrrZfQDpsP0EH51K0F7VPOjHb/Fhr9ArP1VVTLowy6SYHOox0Qhps95MxEpy1iGNlvlF3ZQ== X-Received: by 2002:aa7:8a19:0:b0:4c1:968c:3203 with SMTP id m25-20020aa78a19000000b004c1968c3203mr27395281pfa.42.1642543053836; Tue, 18 Jan 2022 13:57:33 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id q18sm19250114pfn.184.2022.01.18.13.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 13:57:33 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 090D8C0615; Tue, 18 Jan 2022 13:57:32 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v8 3/4] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688] Date: Tue, 18 Jan 2022 13:57:30 -0800 Message-Id: <20220118215731.1320930-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118215731.1320930-1-hjl.tools@gmail.com> References: <20220118215731.1320930-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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Add tst-p_alignmod2-edit to edit the copy of tst-p_alignmod-base.so to set p_align of the first PT_LOAD segment to 1 and verify that the shared library can be loaded normally. --- elf/Makefile | 13 +++++++++++++ elf/tst-p_align2.c | 27 +++++++++++++++++++++++++++ elf/tst-p_alignmod2-edit.c | 27 +++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 elf/tst-p_align2.c create mode 100644 elf/tst-p_alignmod2-edit.c diff --git a/elf/Makefile b/elf/Makefile index 94ebcab1fa..92a6a3baf1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -413,7 +413,9 @@ tests += \ tst-noload \ tst-null-argv \ tst-p_alignmod1-edit \ + tst-p_alignmod2-edit \ tst-p_align1 \ + tst-p_align2 \ tst-relsort1 \ tst-ro-dynamic \ tst-rtld-run-static \ @@ -2594,3 +2596,14 @@ $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \ cp $(objpfx)tst-p_alignmod-base.so $@ $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ $(objpfx)tst-p_alignmod1-edit $@ + +$(objpfx)tst-p_align2: $(objpfx)tst-p_alignmod2.so + +# Make a copy of tst-p_alignmod-base.so and update p_align of the first +# PT_LOAD segment. +$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ + $(objpfx)tst-p_alignmod-base.so + rm -f $@ + cp $(objpfx)tst-p_alignmod-base.so $@ + $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ + $(objpfx)tst-p_alignmod2-edit $@ diff --git a/elf/tst-p_align2.c b/elf/tst-p_align2.c new file mode 100644 index 0000000000..961c7fbbf1 --- /dev/null +++ b/elf/tst-p_align2.c @@ -0,0 +1,27 @@ +/* Check different alignments of PT_LOAD segments in a shared library. + Copyright (C) 2022 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-p_align.h" + +static int +do_test (void) +{ + return do_load_test (); +} + +#include diff --git a/elf/tst-p_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c new file mode 100644 index 0000000000..4c2ae65b4e --- /dev/null +++ b/elf/tst-p_alignmod2-edit.c @@ -0,0 +1,27 @@ +/* Set p_align of the first PT_LOAD segment to 1. + Copyright (C) 2022 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" + +/* Set p_align to 1. */ + +static size_t +update_p_align (size_t p_align __attribute__ ((unused))) +{ + return 1; +}