From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 91AC43858409 for ; Tue, 18 Jan 2022 21:56:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91AC43858409 Received: by mail-pj1-x102a.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so3769136pjj.4 for ; Tue, 18 Jan 2022 13:56:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=el8ZVQlVbQ/nNyZeOlLRAx6Te5+oPb3A9xgK9mRCkC8=; b=QQ3yL+i8dC+tu4VVt/Br6A3A0LzETCa2KNK4XTd3jkipHiL/MkuDaH0Gsslqfyt/pE fIYHilVVGSTcbTuevLgWC7YGApEEbGQ2AaOp2JhJMw+VXuHLCJW8v2ceIoQ+wxQm0GRV m2QOeQwskAv2R6oyvalNC4PZisZE7WjdZG/qNOJNRDePAKp0p7DI3CWmVlB7L6v9siAW mcKngf0BbPXm1dmSR/V5YWQgAGQxasQN1zqUqxo5BQl6bndzpByIsrEukDon94ALvqWN 27JX7Ly+g/aIj+cCOmTlWnLwFA2jrtgCIJ7zX1ByuFhNXTGoyK8RrWDr1eYFiwoOv73G rWRQ== X-Gm-Message-State: AOAM530WqGfUxkfAPZKYdc2daDK7dYCW9UCbkIHGldBWDUV+RbQIE6JQ OjsP2G+wR/bl/mm1lce2k9Krv34+pCyrJAF0eNs= X-Google-Smtp-Source: ABdhPJzcS56rjdmiYlipwYjxJ5AcWkUPq5SISt9DvnvHyxzy5pPGeghEAum0Xac+lKaocD03u6QXr+444UVNWOIn8kM= X-Received: by 2002:a17:90b:1811:: with SMTP id lw17mr677662pjb.120.1642542986659; Tue, 18 Jan 2022 13:56:26 -0800 (PST) MIME-Version: 1.0 References: <20220103230433.1907240-1-hjl.tools@gmail.com> <20220103230433.1907240-4-hjl.tools@gmail.com> In-Reply-To: From: "H.J. Lu" Date: Tue, 18 Jan 2022 13:55:50 -0800 Message-ID: Subject: Re: [PATCH v7 3/4] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688] To: Adhemerval Zanella Cc: GNU C Library , Florian Weimer Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3027.9 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_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 21:56:29 -0000 On Tue, Jan 18, 2022 at 8:32 AM Adhemerval Zanella wrote: > > > > 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? Fixed. > > 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. Fixed. > > + 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. Fixed. > > + 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; > > +} Thanks. -- H.J.