From patchwork Mon Dec 28 14:11:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 41569 X-Patchwork-Delegate: carlos@redhat.com 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 CCA233870908; Mon, 28 Dec 2020 14:11:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CCA233870908 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609164670; bh=TYwZON6wqB77TYIODDNxCkT69pFDDz8KTg2QRoHl16g=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tN00y2V9ZyGmcQWQFmibO+iIbyKXLBgkWaO+9ssfZdorOS4ayIDbyAQT+00xhQF38 FfLlqE7cZW0eCIjKlL1w7wnwtOksjzE4w7wChnXx/HNswnQpIqqboAQBppCbsXJ0Qt +S9a7NxT6jR1lNRZr7JcuDTjeQzpX3RRhRyw+K2o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id 345A538708CC for ; Mon, 28 Dec 2020 14:11:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 345A538708CC Received: by mail-pj1-x1033.google.com with SMTP id w1so4834974pjc.0 for ; Mon, 28 Dec 2020 06:11:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TYwZON6wqB77TYIODDNxCkT69pFDDz8KTg2QRoHl16g=; b=YQDtSEH2qwGohMHO5WzL3WitugxZTktA60u1kpHY84PqEmlaksc/8GBTJPhnVRFtoq LHC/XuNFwWT9xbETrTn1iOP4C6udxDH31P/mTdKctPyszn2fx7L/EcppDsKXGrvJdFEK OZu9FLV3TComqJrnws9B3hC+LRyb4ReWTpQvMO8hz6R+oLpOchAiAgQbVaubeu6NUanw RHSfhY+qb5txK2sdXaxVYcyi9EYGSG9zjno30tQ1AChvc/ojejz3xpflBSY0r7Wvoawv Bu8joDB4ulMSCzLnm2n9uvqEi2LG9nhtffvrRt33PVjQaZ40IqfgV4xzAgXqqhtnHnpz NOFA== X-Gm-Message-State: AOAM5328TdXMw2YhDkCkob70DweEVmt8gYsxDH//6AzFUx1O7cYcjhUa 64b62ZfEhdWb/IcXu4dqTOYjY0yNpPo= X-Google-Smtp-Source: ABdhPJzdpvVDibLafRwoMTlZOT1/71jxt386ZB+yfhr65E2g6R5xhlwY9fkEC08wuQ0Xy9Pt+7smfQ== X-Received: by 2002:a17:90a:fb8a:: with SMTP id cp10mr21175664pjb.136.1609164666655; Mon, 28 Dec 2020 06:11:06 -0800 (PST) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id q35sm14632347pjh.38.2020.12.28.06.11.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 06:11:05 -0800 (PST) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id AEFAF1A0157 for ; Mon, 28 Dec 2020 06:11:04 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86: Check IFUNC definition in unrelocated executable [BZ #20019] Date: Mon, 28 Dec 2020 06:11:02 -0800 Message-Id: <20201228141102.2562718-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3039.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" Calling an IFUNC function defined in unrelocated executable may also lead to segfault. Issue an error message when calling IFUNC function defined in the unrelocated executable from a shared library. --- sysdeps/i386/dl-machine.h | 15 ++++++++++----- sysdeps/x86_64/dl-machine.h | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index fea9e579ec..dedda484ba 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -337,16 +337,21 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, { # ifndef RTLD_BOOTSTRAP if (sym_map != map - && sym_map->l_type != lt_executable && !sym_map->l_relocated) { const char *strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); - _dl_error_printf ("\ + if (sym_map->l_type == lt_executable) + _dl_error_printf ("\ +%s: IFUNC symbol `%s' referenced in `%s' is defined in executable\n", + RTLD_PROGNAME, strtab + refsym->st_name, + map->l_name); + else + _dl_error_printf ("\ %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n", - RTLD_PROGNAME, map->l_name, - sym_map->l_name, - strtab + refsym->st_name); + RTLD_PROGNAME, map->l_name, + sym_map->l_name, + strtab + refsym->st_name); } # endif value = ((Elf32_Addr (*) (void)) value) (); diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index bb93c7c6ab..fc847f4bc2 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -314,16 +314,21 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, { # ifndef RTLD_BOOTSTRAP if (sym_map != map - && sym_map->l_type != lt_executable && !sym_map->l_relocated) { const char *strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); - _dl_error_printf ("\ + if (sym_map->l_type == lt_executable) + _dl_error_printf ("\ +%s: IFUNC symbol `%s' referenced in `%s' is defined in executable\n", + RTLD_PROGNAME, strtab + refsym->st_name, + map->l_name); + else + _dl_error_printf ("\ %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n", - RTLD_PROGNAME, map->l_name, - sym_map->l_name, - strtab + refsym->st_name); + RTLD_PROGNAME, map->l_name, + sym_map->l_name, + strtab + refsym->st_name); } # endif value = ((ElfW(Addr) (*) (void)) value) ();