From patchwork Fri Apr 22 19:01:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 53134 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 949183856DDB for ; Fri, 22 Apr 2022 19:07:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 949183856DDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650654427; bh=aKOrj9p0Cl+StfSLu3F5fvj7KfgWTegHOX2dS/WMJZQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=k0b3NcfbJazglHd/ij9V6d0mOV7qCPNlNREohqfJ2pkTHymaXx8myirQGzE2aJoqL SlBRrn6bcXg2h+fvRG3K62oTw28hvcftwsw+iV5f9l8qC7K5bjFRpa7JvvCB+Dmd8A 9+LhQpEjIRaaytYlSyXRzMIvbnWorGEsP91FyNCU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 989F63858C51 for ; Fri, 22 Apr 2022 19:01:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 989F63858C51 Received: by mail-pg1-x52a.google.com with SMTP id g3so7422112pgg.3 for ; Fri, 22 Apr 2022 12:01:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aKOrj9p0Cl+StfSLu3F5fvj7KfgWTegHOX2dS/WMJZQ=; b=dJvbkkw0ddaXVFu/wTh4GSQVqcBcF9s6Z3PlWTdXom8uKS0Gt+1HZ1VvcSHAzNK2w/ jk9bOD25qhmlIwMS48PN65gGertKGQsVVZYrOwh5DnKhxIPnqra5VkgnExB/v8CX1qSq Rm0epEKuUn6E61rB5szfi66Olgvu4fhsAaqNbZZG+yi8jeZ+yzsm0J73zoaX14mzl+Vs FHDcCmFxdIitBaNOD1tg1HyttN2PH77gLbZ7TS1qeYXlCIQ3ceiteUSoE/iTEHOqLtx1 TovkkNROhFN3HwLwO2yMaGiOBPaAO/Jd3QfOVV1A3kywDst2qnG1oR+mIA7QYtsqhNZu mx5g== X-Gm-Message-State: AOAM530MjTNsbIjF2id6cF2waNsYLH/JnCbnm/GapY139OzqxOui4kH8 5HM2A7tJi5Jr8GDYiyYZLHs= X-Google-Smtp-Source: ABdhPJxSwaYppuaLNtKNbBhShFzjAaU9KZwhmjpytHCdS2iX5fv3HjH3TNv8e+7yNetw8eL0nsnILg== X-Received: by 2002:aa7:8d47:0:b0:4f6:a7f9:1ead with SMTP id s7-20020aa78d47000000b004f6a7f91eadmr6493434pfe.42.1650654104382; Fri, 22 Apr 2022 12:01:44 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id h189-20020a636cc6000000b0039841f669bcsm2900072pgc.78.2022.04.22.12.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:01:42 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 6A54EC0302; Fri, 22 Apr 2022 12:01:41 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v11 5/7] elf: Add more DT_RELR tests Date: Fri, 22 Apr 2022 12:01:37 -0700 Message-Id: <20220422190139.2615492-6-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220422190139.2615492-1-hjl.tools@gmail.com> References: <20220422190139.2615492-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3026.3 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_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Verify that: 1. A DT_RELR shared library without DT_NEEDED works. 2. A DT_RELR shared library without DT_VERNEED works. 3. A DT_RELR shared library without libc.so on DT_NEEDED works. --- elf/Makefile | 76 ++++++++++++++++++++++++++++++++++++++++-- elf/tst-relr-mod2.c | 46 +++++++++++++++++++++++++ elf/tst-relr-mod3a.c | 49 +++++++++++++++++++++++++++ elf/tst-relr-mod3b.c | 22 ++++++++++++ elf/tst-relr-mod4a.c | 19 +++++++++++ elf/tst-relr-mod4b.c | 19 +++++++++++ elf/tst-relr-mod4b.map | 3 ++ elf/tst-relr2.c | 27 +++++++++++++++ elf/tst-relr3.c | 27 +++++++++++++++ elf/tst-relr4.c | 1 + 10 files changed, 286 insertions(+), 3 deletions(-) create mode 100644 elf/tst-relr-mod2.c create mode 100644 elf/tst-relr-mod3a.c create mode 100644 elf/tst-relr-mod3b.c create mode 100644 elf/tst-relr-mod4a.c create mode 100644 elf/tst-relr-mod4b.c create mode 100644 elf/tst-relr-mod4b.map create mode 100644 elf/tst-relr2.c create mode 100644 elf/tst-relr3.c create mode 100644 elf/tst-relr4.c diff --git a/elf/Makefile b/elf/Makefile index 60e41035d7..bd9d03f527 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -544,7 +544,20 @@ endif ifeq ($(have-dt-relr),yes) tests += \ tst-relr \ + tst-relr2 \ + tst-relr3 \ + tst-relr4 \ # tests +modules-names-dt-relr = \ + tst-relr-mod2 \ + tst-relr-mod3a \ + tst-relr-mod3b \ + tst-relr-mod4a \ + tst-relr-mod4b \ +# modules-names-dt-relr +modules-names += $(modules-names-dt-relr) +# These shared libraries have special build rules. +modules-names-nobuild += $(modules-names-dt-relr) ifeq ($(have-fpie),yes) tests += \ tst-relr-pie \ @@ -559,6 +572,11 @@ endif CFLAGS-tst-relr-pie.c += $(pie-ccflag) LDFLAGS-tst-relr += -Wl,-z,pack-relative-relocs LDFLAGS-tst-relr-pie += -Wl,-z,pack-relative-relocs +CFLAGS-tst-relr-mod2.c += $(no-stack-protector) +CFLAGS-tst-relr-mod3a.c += $(no-stack-protector) +CFLAGS-tst-relr-mod3b.c += $(no-stack-protector) +CFLAGS-tst-relr-mod4a.c += $(no-stack-protector) +CFLAGS-tst-relr-mod4b.c += $(no-stack-protector) endif endif @@ -636,7 +654,7 @@ test-extras += \ tst-tlsmod17a \ tst-tlsmod18a \ # test-extras -modules-names = \ +modules-names += \ circlemod1 \ circlemod1a \ circlemod2 \ @@ -1006,8 +1024,13 @@ extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) # filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special # rules. -modules-names-nobuild := filtmod1 tst-big-note-lib tst-ro-dynamic-mod \ - tst-audit24bmod1 tst-audit24bmod2 +modules-names-nobuild += \ + filtmod1 \ + tst-audit24bmod1 \ + tst-audit24bmod2 \ + tst-big-note-lib \ + tst-ro-dynamic-mod \ +# modules-names-nobuild tests += $(tests-static) @@ -2808,3 +2831,50 @@ $(objpfx)check-tst-relr-pie.out: $(objpfx)tst-relr-pie | sed -ne '/required from libc.so/,$$ p' \ | grep GLIBC_ABI_DT_RELR > $@; \ $(evaluate-test) + +# The test checks if a DT_RELR shared library without DT_NEEDED works as +# intended, so it uses an explicit link rule. +$(objpfx)tst-relr2: $(objpfx)tst-relr-mod2.so +$(objpfx)tst-relr-mod2.so: $(objpfx)tst-relr-mod2.os + $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \ + $(LDFLAGS-soname-fname) \ + -shared -o $@.new $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ + +# The test checks if a DT_RELR shared library without DT_VERNEED works as +# intended, so it uses an explicit link rule. +$(objpfx)tst-relr3: $(objpfx)tst-relr-mod3a.so +$(objpfx)tst-relr-mod3b.so: $(objpfx)tst-relr-mod3b.os + $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \ + $(LDFLAGS-soname-fname) \ + -shared -o $@.new $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ + +$(objpfx)tst-relr-mod3a.so: $(objpfx)tst-relr-mod3a.os \ + $(objpfx)tst-relr-mod3b.so + $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \ + $(LDFLAGS-soname-fname) \ + -shared -o $@.new $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ + +# The test checks if a DT_RELR shared library without libc.so on DT_NEEDED +# works as intended, so it uses an explicit link rule. +$(objpfx)tst-relr4: $(objpfx)tst-relr-mod4a.so +$(objpfx)tst-relr-mod4b.so: $(objpfx)tst-relr-mod4b.os + $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \ + $(LDFLAGS-soname-fname) \ + -Wl,--version-script=tst-relr-mod4b.map \ + -shared -o $@.new $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ + +$(objpfx)tst-relr-mod4a.so: $(objpfx)tst-relr-mod4a.os \ + $(objpfx)tst-relr-mod4b.so + $(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \ + $(LDFLAGS-soname-fname) \ + -shared -o $@.new $(filter-out $(map-file),$^) + $(call after-link,$@.new) + mv -f $@.new $@ diff --git a/elf/tst-relr-mod2.c b/elf/tst-relr-mod2.c new file mode 100644 index 0000000000..dc0a63365c --- /dev/null +++ b/elf/tst-relr-mod2.c @@ -0,0 +1,46 @@ +/* Test for DT_RELR in a shared library without DT_NEEDED. + 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 + +static int o, x; + +#define ELEMS O O O O O O O O X X X X X X X O O X O O X X X E X E E O X O E +#define E 0, + +#define O &o, +#define X &x, +void *arr[] = { ELEMS }; +#undef O +#undef X + +#define O 1, +#define X 2, +static char val[] = { ELEMS }; + +int +foo (void) +{ + int err = 0; + for (int i = 0; i < array_length (arr); i++) + if (!((arr[i] == 0 && val[i] == 0) + || (arr[i] == &o && val[i] == 1) + || (arr[i] == &x && val[i] == 2))) + err++; + return err; +} diff --git a/elf/tst-relr-mod3a.c b/elf/tst-relr-mod3a.c new file mode 100644 index 0000000000..d1621c91b1 --- /dev/null +++ b/elf/tst-relr-mod3a.c @@ -0,0 +1,49 @@ +/* Test for DT_RELR in a shared library without DT_VERNEED. + 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 + +static int o, x; + +#define ELEMS O O O O O O O O X X X X X X X O O X O O X X X E X E E O X O E +#define E 0, + +#define O &o, +#define X &x, +void *arr[] = { ELEMS }; +#undef O +#undef X + +#define O 1, +#define X 2, +static char val[] = { ELEMS }; + +extern void bar (void); + +int +foo (void) +{ + int err = 0; + for (int i = 0; i < array_length (arr); i++) + if (!((arr[i] == 0 && val[i] == 0) + || (arr[i] == &o && val[i] == 1) + || (arr[i] == &x && val[i] == 2))) + err++; + bar (); + return err; +} diff --git a/elf/tst-relr-mod3b.c b/elf/tst-relr-mod3b.c new file mode 100644 index 0000000000..544cb4bc05 --- /dev/null +++ b/elf/tst-relr-mod3b.c @@ -0,0 +1,22 @@ +/* Test for DT_RELR in a shared library without DT_VERNEED. + 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 + . */ + +void +bar (void) +{ +} diff --git a/elf/tst-relr-mod4a.c b/elf/tst-relr-mod4a.c new file mode 100644 index 0000000000..e1bfebd4ac --- /dev/null +++ b/elf/tst-relr-mod4a.c @@ -0,0 +1,19 @@ +/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED. + 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-relr-mod3a.c" diff --git a/elf/tst-relr-mod4b.c b/elf/tst-relr-mod4b.c new file mode 100644 index 0000000000..617dff79c3 --- /dev/null +++ b/elf/tst-relr-mod4b.c @@ -0,0 +1,19 @@ +/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED. + 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-relr-mod3b.c" diff --git a/elf/tst-relr-mod4b.map b/elf/tst-relr-mod4b.map new file mode 100644 index 0000000000..7f02247262 --- /dev/null +++ b/elf/tst-relr-mod4b.map @@ -0,0 +1,3 @@ +DT_RELR { + global: bar; +}; diff --git a/elf/tst-relr2.c b/elf/tst-relr2.c new file mode 100644 index 0000000000..10d77f1791 --- /dev/null +++ b/elf/tst-relr2.c @@ -0,0 +1,27 @@ +/* Test for DT_RELR in a shared library without DT_NEEDED. + 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 + . */ + +extern int foo (void); + +static int +do_test (void) +{ + return foo (); +} + +#include diff --git a/elf/tst-relr3.c b/elf/tst-relr3.c new file mode 100644 index 0000000000..69106cf7b7 --- /dev/null +++ b/elf/tst-relr3.c @@ -0,0 +1,27 @@ +/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED. + 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 + . */ + +extern int foo (void); + +static int +do_test (void) +{ + return foo (); +} + +#include diff --git a/elf/tst-relr4.c b/elf/tst-relr4.c new file mode 100644 index 0000000000..19a75013f8 --- /dev/null +++ b/elf/tst-relr4.c @@ -0,0 +1 @@ +#include "tst-relr3.c"