From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by sourceware.org (Postfix) with ESMTPS id C9C743858438 for ; Mon, 24 Jan 2022 14:16:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C9C743858438 Received: by mail-oi1-x230.google.com with SMTP id s185so8863128oie.3 for ; Mon, 24 Jan 2022 06:16:49 -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=fIoxRZORQNuJpRLdo4c5sfu8do95lU+ARQalAxgm7Yo=; b=T1Q34+ubmftkfujpTvrz7ESjmp2LbbtPAG3AQMErGR37M7lRnbpenuI+MxdlK02rKP nf6Y8pbgKBgGBPDBKKz1NUdJKeYe3KZ+AeMwEaEXmTEEXrw0R1nm2m6M4C8ibue6tLKF hpUu5VZopCUn/Dl3mVAcTI1zgntW3ZRzqzZFVHtq3ARXdoynqO5qQFBW41D7B/CvBfC+ gprvPdKR56lQZWD5i09H0H4Mz4/n4KDRV+xPw/I8eNxauf0ldZAU7XaxK5EwRQVu/GoA FCTvob8F3I7m+YGcgcUopDCO5qdKrBNYoAIm9k6+AHSyDcVzDP7IKx5cnM0BafY6oglS TmWg== X-Gm-Message-State: AOAM530IPCGpY+B7NZgjPQMU591tWJLgYSQUut7HD/1uLUtsNr/qS9wH jkVCc/7sKMCnUeUlQIdn8Q8jPQ== X-Google-Smtp-Source: ABdhPJwcrDWtVhAGwpv/IEPJagzWmSQQxOUbTAmCBF+ZaA03PgPEIvuXZl9bQrN0HHh6rpqa4x2gFg== X-Received: by 2002:aca:a9cf:: with SMTP id s198mr1591517oie.71.1643033809142; Mon, 24 Jan 2022 06:16:49 -0800 (PST) Received: from ?IPV6:2804:431:c7cb:27f8:c505:63c0:de61:b716? ([2804:431:c7cb:27f8:c505:63c0:de61:b716]) by smtp.gmail.com with ESMTPSA id e192sm2193554oob.11.2022.01.24.06.16.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 06:16:48 -0800 (PST) Message-ID: <38721f69-3565-353f-e1bc-4c84f2a8acb2@linaro.org> Date: Mon, 24 Jan 2022 11:16:47 -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 v9 2/3] 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: <20220121211205.268178-1-hjl.tools@gmail.com> <20220121211205.268178-3-hjl.tools@gmail.com> From: Adhemerval Zanella In-Reply-To: <20220121211205.268178-3-hjl.tools@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 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: Mon, 24 Jan 2022 14:16:51 -0000 On 21/01/2022 18:12, H.J. Lu wrote: > 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. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > 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 cdb41c686e..c63abab44b 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 \ > @@ -2595,3 +2597,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; > +}