From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id BE61F3856DE8 for ; Tue, 19 Jul 2022 16:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BE61F3856DE8 Received: by mail-pf1-x42d.google.com with SMTP id w185so13978564pfb.4 for ; Tue, 19 Jul 2022 09:00:50 -0700 (PDT) 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; bh=eHpred/TVQiUP+kXOuP31dBGsBjtOJIyXqGFI32s1M8=; b=KinPCcYe8TPifraC3AvLvsAz+j/qrF/JaUgrUrA2OPA6Mft6RB3TmazfZBO0uO4/j4 GrO0UK7DvDIl1WISINH9uXkLEnrEkczegP0B0/WMpPcKYr7NevjKOh5ZovrU6pHLGl4L 64NmRPGLeEhclmeXZP+cGnCwh5pcJeGT7xZjg2srpeThkRsWIUit5Bv8vXvK/AfQS734 jgCXgegrAp/Vd/80XBIiCXrAt+dUjhxOkW6cusrR2Wkx7d2kGqlugtD6BjvSQFY/je5P Ea8ZDR12w8LHk6QZPTj0rAFR7fIqvAFuHGSPUqbozDR3qvVQuCHeg0yhr8+aRiISFQbx gYZw== X-Gm-Message-State: AJIora/ZKJLtDz/yl57d6KG4ZxTZazp1mjqLcC3vrTum3oWFqx7adKWI 6nblsRrQx+tm36JdoxY71/8CefJjG0bxEumLP3TPuAXH X-Google-Smtp-Source: AGRyM1vNOxEnpz590HKEB1imFR5nY/YB5A4VYvwghrVp5GzLbvvb4iAMMCt0FFoavpcZ8fkbuFVlkRpffprze6gslhE= X-Received: by 2002:a63:494a:0:b0:41a:56e8:62e2 with SMTP id y10-20020a63494a000000b0041a56e862e2mr1307526pgk.586.1658246449418; Tue, 19 Jul 2022 09:00:49 -0700 (PDT) MIME-Version: 1.0 References: <20220718200037.1129322-1-hjl.tools@gmail.com> In-Reply-To: <20220718200037.1129322-1-hjl.tools@gmail.com> From: "H.J. Lu" Date: Tue, 19 Jul 2022 09:00:13 -0700 Message-ID: Subject: Re: [PATCH] x86: Properly check invalid relocation against protected symbol To: Binutils Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3023.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2022 16:00:53 -0000 On Mon, Jul 18, 2022 at 1:00 PM H.J. Lu wrote: > > Only check invalid relocation against protected symbol defined in shared > object. > > bfd/ > > PR ld/29377 > * elf32-i386.c (elf_i386_scan_relocs): Only check invalid > relocation against protected symbol defined in shared object. > * elf64-x86-64.c (elf_x86_64_scan_relocs): Likewise. > > ld/ > > PR ld/29377 > * testsuite/ld-elf/linux-x86.exp: Run PR ld/29377 tests. > * testsuite/ld-elf/pr29377a.c: New file. > * testsuite/ld-elf/pr29377b.c: Likewise. > --- > bfd/elf32-i386.c | 2 ++ > bfd/elf64-x86-64.c | 2 ++ > ld/testsuite/ld-elf/linux-x86.exp | 16 ++++++++++++++++ > ld/testsuite/ld-elf/pr29377a.c | 5 +++++ > ld/testsuite/ld-elf/pr29377b.c | 10 ++++++++++ > 5 files changed, 35 insertions(+) > create mode 100644 ld/testsuite/ld-elf/pr29377a.c > create mode 100644 ld/testsuite/ld-elf/pr29377b.c > > diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c > index e4106d9fd3b..3d39dc07fe0 100644 > --- a/bfd/elf32-i386.c > +++ b/bfd/elf32-i386.c > @@ -1811,6 +1811,8 @@ elf_i386_scan_relocs (bfd *abfd, > if (h->pointer_equality_needed > && h->type == STT_FUNC > && eh->def_protected > + && !SYMBOL_DEFINED_NON_SHARED_P (h) > + && h->def_dynamic > && elf_has_indirect_extern_access (h->root.u.def.section->owner)) > { > /* Disallow non-canonical reference to canonical > diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c > index 6154a70bdd7..48ca6309d1b 100644 > --- a/bfd/elf64-x86-64.c > +++ b/bfd/elf64-x86-64.c > @@ -2254,6 +2254,8 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info, > if (h->pointer_equality_needed > && h->type == STT_FUNC > && eh->def_protected > + && !SYMBOL_DEFINED_NON_SHARED_P (h) > + && h->def_dynamic > && elf_has_indirect_extern_access (h->root.u.def.section->owner)) > { > /* Disallow non-canonical reference to canonical > diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp > index 6035ecd6829..0f0a6f01ec0 100644 > --- a/ld/testsuite/ld-elf/linux-x86.exp > +++ b/ld/testsuite/ld-elf/linux-x86.exp > @@ -134,6 +134,22 @@ run_cc_link_tests [list \ > {{readelf {--dyn-syms -W} pr28158.rd} {nm -D pr28158.nd}} \ > "pr28158" \ > ] \ > + [list \ > + "Build pr29377.o" \ > + "-r -Wl,-z,noexecstack" \ > + "" \ > + {pr29377a.c indirect-extern-access.S} \ > + {} \ > + "pr29377.o" \ > + ] \ > + [list \ > + "Build pr29377" \ > + "$NOPIE_LDFLAGS tmpdir/pr29377.o" \ > + "-fPIC" \ > + {pr29377b.c} \ > + {} \ > + "pr29377" \ > + ] \ > ] > > run_ld_link_exec_tests [list \ > diff --git a/ld/testsuite/ld-elf/pr29377a.c b/ld/testsuite/ld-elf/pr29377a.c > new file mode 100644 > index 00000000000..41d9545e3bf > --- /dev/null > +++ b/ld/testsuite/ld-elf/pr29377a.c > @@ -0,0 +1,5 @@ > +__attribute__ ((visibility ("protected"))) > +void > +foo (void) > +{ > +} > diff --git a/ld/testsuite/ld-elf/pr29377b.c b/ld/testsuite/ld-elf/pr29377b.c > new file mode 100644 > index 00000000000..3cf163b25b4 > --- /dev/null > +++ b/ld/testsuite/ld-elf/pr29377b.c > @@ -0,0 +1,10 @@ > +extern void foo (void); > + > +void (*foo_p) (void); > + > +int > +main () > +{ > + foo_p = foo; > + return 0; > +} > -- > 2.36.1 > I am backporting this to 2.38 and 2.39 branches. -- H.J.