From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id BA9F33858037 for ; Tue, 18 Jan 2022 21:51:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA9F33858037 Received: by mail-pj1-x102b.google.com with SMTP id i8-20020a17090a138800b001b3936fb375so4105576pja.1 for ; Tue, 18 Jan 2022 13:51:05 -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=M8YCedg1g+D5A0qEaV2iPknOp8dx3pvnIKhXIJrjNFI=; b=Vf0QdshImV1LTFFpNaigrkd4vexBhlfyzvtilTVhJWCw6EfsXgcaGgwDeOnrQuf1Dw OkbVneKjpBvSatB+tY5roCI53OjhPSYeFfSUwAUpiic8xrDuj5Uaw719BRdv/AKKjrfZ rcCW7OYYM2rcVvyOKoxP4Aq74ksOkYjed44NJ2IrjQ4QGX3no9rcijZNOzW6BFaM/tE6 593g3NoayxGCiEJpLb+6+rBqkKOVz6csy06raTcxMAXhMo30111K2kfmEEmSY4XOPLRV rUu/3k7uGLt3gJaDbS/Yb1CvhpNJBhtqV30vD25nVOstIRnc+2p9C5irXLGlONMHswsM fj4Q== X-Gm-Message-State: AOAM533ghxmcpjyXa84+jIT7VrmoYHIEz4d/wRI0ZZn+IbaR4vgIPLJg Eqq1h2rgzBN7s4Q6JyAKUXDyKrG7bmqgZBCjANI= X-Google-Smtp-Source: ABdhPJyfHjRZNhtCsHYkgrZqsiAkYzTW8630T0nOY9bgrx9yuNvj0lBuItkAEaQop903E3ePpCJvsDsOvGlsK8Cf2QY= X-Received: by 2002:a17:90b:1811:: with SMTP id lw17mr656615pjb.120.1642542664655; Tue, 18 Jan 2022 13:51:04 -0800 (PST) MIME-Version: 1.0 References: <20220103230433.1907240-1-hjl.tools@gmail.com> <20220103230433.1907240-5-hjl.tools@gmail.com> In-Reply-To: From: "H.J. Lu" Date: Tue, 18 Jan 2022 13:50:28 -0800 Message-ID: Subject: Re: [PATCH v7 4/4] elf: Add a test for PT_LOAD segments with invalid p_align [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:51:07 -0000 On Tue, Jan 18, 2022 at 10:05 AM Adhemerval Zanella wrote: > > > > On 03/01/2022 20:04, H.J. Lu wrote: > > Build tst-p_alignmod3.so with 256 byte page size and verify that it is > > rejected with a proper error message. > > --- > > elf/Makefile | 11 +++++++++++ > > elf/tst-p_align3.c | 27 +++++++++++++++++++++++++++ > > elf/tst-p_align3.sh | 26 ++++++++++++++++++++++++++ > > elf/tst-p_alignmod3.c | 22 ++++++++++++++++++++++ > > 4 files changed, 86 insertions(+) > > create mode 100644 elf/tst-p_align3.c > > create mode 100755 elf/tst-p_align3.sh > > create mode 100644 elf/tst-p_alignmod3.c > > > > diff --git a/elf/Makefile b/elf/Makefile > > index e4be3fa518..eca730ae8f 100644 > > --- a/elf/Makefile > > +++ b/elf/Makefile > > @@ -409,6 +409,10 @@ tests += \ > > tst-p_alignmod2-edit \ > > tst-p_align1 \ > > tst-p_align2 \ > > + tst-p_align3 \ > > + > > +modules-names += \ > > + tst-p_alignmod3 \ > > > > endif > > > > @@ -2110,3 +2114,10 @@ $(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ > > cp $(objpfx)tst-alignmod3.so $@ > > $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ > > $(objpfx)tst-p_alignmod2-edit $@ > > + > > +LDFLAGS-tst-p_alignmod3.so += -Wl,-z,max-page-size=0x100,-z,common-page-size=0x100 > > + > > +$(objpfx)tst-p_align3: $(objpfx)tst-p_alignmod3.so > > +$(objpfx)tst-p_align3.out: tst-p_align3.sh $(objpfx)tst-p_align3 > > + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ > > + $(evaluate-test) > > diff --git a/elf/tst-p_align3.c b/elf/tst-p_align3.c > > new file mode 100644 > > index 0000000000..61c616ac3b > > --- /dev/null > > +++ b/elf/tst-p_align3.c > > @@ -0,0 +1,27 @@ > > +/* Check invalid p_align of PT_LOAD segments in a shared library. > > + Copyright (C) 2021 Free Software Foundation, Inc. > > Update Copyright years. 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); > > As before, do_load_test returns void. Fixed. > > + > > +static int > > +do_test (void) > > +{ > > + return do_load_test (); > > +} > > + > > +#include > > diff --git a/elf/tst-p_align3.sh b/elf/tst-p_align3.sh > > new file mode 100755 > > index 0000000000..11572aa217 > > --- /dev/null > > +++ b/elf/tst-p_align3.sh > > @@ -0,0 +1,26 @@ > > +#!/bin/sh > > +# Check invalid p_align of PT_LOAD segments in a shared library. > > +# Copyright (C) 2021 Free Software Foundation, Inc. > > Update Copyright years. 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 > > +# . > > + > > +common_objpfx=$1; shift > > +test_program_prefix=$1; shift > > + > > +${test_program_prefix} \ > > + ${common_objpfx}elf/tst-p_align3 \ > > + 2> ${common_objpfx}elf/tst-p_align3.out && exit 1 > > I think we should test for command exit output: > > test $? -ne 127 && exit 1 Fixed. > > +grep "ELF load command address/offset not page-aligned" ${common_objpfx}elf/tst-p_align3.out > > diff --git a/elf/tst-p_alignmod3.c b/elf/tst-p_alignmod3.c > > new file mode 100644 > > index 0000000000..90f3af467e > > --- /dev/null > > +++ b/elf/tst-p_alignmod3.c > > @@ -0,0 +1,22 @@ > > +/* Check invalid p_align of PT_LOAD segment in a shared library. > > + Copyright (C) 2021 Free Software Foundation, Inc. > > > Update Copyright years. 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 > > + . */ > > + > > +void > > +do_load_test (void) > > +{ > > +} Thanks. -- H.J.