From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 773183857C48 for ; Tue, 18 Jan 2022 16:32:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 773183857C48 Received: by mail-ot1-x335.google.com with SMTP id v8-20020a9d6048000000b005960952c694so14430661otj.12 for ; Tue, 18 Jan 2022 08:32:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=skho6LqrhSSuxRUxSme/UJyGqWaAfUkYxzxP4U0R9JU=; b=J1xZUhESQyK2KV3x8VepnBr9Be6Pb+Gk7q0r6UcDSTqZeZfqkPuhml2+l0VtpUlnGG rrXWko20BiAgnOxVqxTuW9bxsQ2iptekSdErrDQWYK/lS7J9Tm+VqYLZ3FbuD8sf/xdZ DLS5Njjj/+9LDk8QTC/dMElki+k5OCmDSI6pqrhuGfNAQ0NNRXFUUCH5HaJ9FzzaFuMw r/eYe0Zj+qHv1M7p+ISbnPGYRfboVOWp7n3pMqgfZtEtPFZoqUfWBIcdH3uTKpudgsnE pDcOfHtvoqyNdZt9HMPQfpT8gKoLP46JC35QJtjzcUbu5vdrGcAXXepIQkt9L1b8qFMv 8bGg== X-Gm-Message-State: AOAM532BQpQ+MQEWprjtHJ1HBZteP8+OOJScnGk/Fm2jE76IHxS7Rp1m Dv1IqO3FyqcQxVF0pWq8/VIUxg== X-Google-Smtp-Source: ABdhPJwwKOnwrqTZrhnMZqwfGhCOs1tpRj6iSZe705KzLhrV3QsiGYC05ulNETbg+nN0Dkc4lXgBfg== X-Received: by 2002:a9d:422:: with SMTP id 31mr15883518otc.296.1642523527803; Tue, 18 Jan 2022 08:32:07 -0800 (PST) Received: from ?IPV6:2804:431:c7cb:989a:419b:3fe6:8885:ab23? ([2804:431:c7cb:989a:419b:3fe6:8885:ab23]) by smtp.gmail.com with ESMTPSA id c4sm6996944ook.16.2022.01.18.08.32.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jan 2022 08:32:07 -0800 (PST) Message-ID: Date: Tue, 18 Jan 2022 13:32:04 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v7 3/4] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688] Content-Language: en-US To: "H.J. Lu" , libc-alpha@sourceware.org Cc: Florian Weimer References: <20220103230433.1907240-1-hjl.tools@gmail.com> <20220103230433.1907240-4-hjl.tools@gmail.com> From: Adhemerval Zanella In-Reply-To: <20220103230433.1907240-4-hjl.tools@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, 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-List-Received-Date: Tue, 18 Jan 2022 16:32:10 -0000 On 03/01/2022 20:04, H.J. Lu wrote: > Add tst-p_alignmod2-edit to edit the copy of tst-alignmod3.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 9c831faac1..e4be3fa518 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -406,7 +406,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > ifeq (yes,$(build-shared)) > tests += \ > tst-p_alignmod1-edit \ > + tst-p_alignmod2-edit \ > tst-p_align1 \ > + tst-p_align2 \ > Maybe add a #test as final member? > endif > > @@ -2097,3 +2099,14 @@ $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \ > cp $(objpfx)tst-alignmod3.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-alignmod3.so and update p_align of the first PT_LOAD > +# segment. > +$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ > + $(objpfx)tst-alignmod3.so Same as previous patch, it uses tst-alignmod3.so which only defined in next one. > + rm -f $@ > + cp $(objpfx)tst-alignmod3.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..cab9793220 > --- /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) 2021 Free Software Foundation, Inc. Update the Copyright year. > + 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_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c > new file mode 100644 > index 0000000000..2f47b37c9e > --- /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) 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" > + > +/* Set p_align to 1. */ > + > +static size_t > +update_p_align (size_t p_align __attribute__ ((unused))) > +{ > + return 1; > +}