| Message ID | 20220103230433.1907240-5-hjl.tools@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Adhemerval Zanella Netto |
| Headers | show |
| Series | Properly align all PT_LOAD segments with tests | expand |
| Context | Check | Description |
|---|---|---|
| dj/TryBot-apply_patch | success | Patch applied to master at the time it was sent |
| dj/TryBot-32bit | success | Build for i686 |
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. > + 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 > + <https://www.gnu.org/licenses/>. */ > + > +extern int do_load_test (void); As before, do_load_test returns void. > + > +static int > +do_test (void) > +{ > + return do_load_test (); > +} > + > +#include <support/test-driver.c> > 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. > +# 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 > +# <https://www.gnu.org/licenses/>. > + > +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 > +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. > + 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 > + <https://www.gnu.org/licenses/>. */ > + > +void > +do_load_test (void) > +{ > +}
On Tue, Jan 18, 2022 at 10:05 AM Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 > > + <https://www.gnu.org/licenses/>. */ > > + > > +extern int do_load_test (void); > > As before, do_load_test returns void. Fixed. > > + > > +static int > > +do_test (void) > > +{ > > + return do_load_test (); > > +} > > + > > +#include <support/test-driver.c> > > 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 > > +# <https://www.gnu.org/licenses/>. > > + > > +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 > > + <https://www.gnu.org/licenses/>. */ > > + > > +void > > +do_load_test (void) > > +{ > > +} Thanks.
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. + 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 + <https://www.gnu.org/licenses/>. */ + +extern int do_load_test (void); + +static int +do_test (void) +{ + return do_load_test (); +} + +#include <support/test-driver.c> 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. +# 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 +# <https://www.gnu.org/licenses/>. + +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 +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. + 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 + <https://www.gnu.org/licenses/>. */ + +void +do_load_test (void) +{ +}