From patchwork Fri Jan 28 18:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 50552 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 F021A382C401 for ; Fri, 28 Jan 2022 18:57:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F021A382C401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643396243; bh=7KA/2vYz/7mxRERLzG9U1qddnsPZxd8fR3FaYUDfkug=; h=Subject:To:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=eZqcBj/ibFQArJZrCq+BcFZeh/Xikds1v4D5SdE/JNk9jg2f5UZEFDU+eGLQVGn8g QvXXOmONPgWECfk4oDxdy+D7kXCcTutpyAq04HIF80IVWxxsIbLhX2HxH3SKJ/Qj17 nnkRzF8r8wU0Ef/uE8NdvU5yCeiN+bnnMA1kQIIE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mengyan1223.wang (mengyan1223.wang [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id BFBD8385840C for ; Fri, 28 Jan 2022 18:57:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BFBD8385840C Received: from localhost.localdomain (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@mengyan1223.wang) by mengyan1223.wang (Postfix) with ESMTPSA id 66A6165B4F; Fri, 28 Jan 2022 13:56:59 -0500 (EST) Message-ID: <046da3ae8fc57687b5a9480381904d3f53b1010f.camel@mengyan1223.wang> Subject: [PATCH] mips: pldd: support DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL To: libc-alpha@sourceware.org Date: Sat, 29 Jan 2022 02:56:56 +0800 User-Agent: Evolution 3.42.3 MIME-Version: 1.0 X-Spam-Status: No, score=-3037.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Cc: syq@debian.org, Joseph Myers , Jiaxun Yang Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" MIPS uses DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL for accessing r_debug, instead of DT_DEBUG. --- elf/pldd-xx.c | 67 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c index 1cdfb49c53..ec397f00e5 100644 --- a/elf/pldd-xx.c +++ b/elf/pldd-xx.c @@ -22,6 +22,12 @@ #define EW_(e, w, t) EW__(e, w, _##t) #define EW__(e, w, t) e##w##t +#if CLASS == 32 +typedef Elf32_Word E(val_type); +#else +typedef Elf64_Xword E(val_type); +#endif + struct E(link_map) { EW(Addr) l_addr; @@ -70,6 +76,35 @@ _Static_assert (offsetof (struct r_debug, r_map) == offsetof (struct E(r_debug), r_map), "r_map"); #endif +static EW(Addr) +E(r_debug_offset) (EW(Dyn) *d, int memfd, EW(Addr) d_addr) +{ +#ifdef __mips__ + EW(Addr) ptr; + + switch (d->d_tag) + { + case DT_MIPS_RLD_MAP_REL: + ptr = d_addr + d->d_un.d_val; + break; + case DT_MIPS_RLD_MAP: + ptr = d->d_un.d_ptr; + break; + default: + return 0; + } + + if (pread (memfd, &ptr, sizeof (ptr), ptr) != sizeof (ptr)) + return 0; + + return ptr; +#else + if (d->d_tag == DT_DEBUG) + return (off_t) d->d_un.d_ptr; + + return 0; +#endif +} static int @@ -126,21 +161,25 @@ E(find_maps) (const char *exe, int memfd, pid_t pid, void *auxv, != p[i].p_filesz) error (EXIT_FAILURE, 0, gettext ("cannot read dynamic section")); - /* Search for the DT_DEBUG entry. */ + /* Search for the r_debug struct. */ for (unsigned int j = 0; j < p[i].p_filesz / sizeof (EW(Dyn)); ++j) - if (dyn[j].d_tag == DT_DEBUG && dyn[j].d_un.d_ptr != 0) - { - struct E(r_debug) r; - if (pread (memfd, &r, sizeof (r), dyn[j].d_un.d_ptr) - != sizeof (r)) - error (EXIT_FAILURE, 0, gettext ("cannot read r_debug")); - - if (r.r_map != 0) - { - list = r.r_map; - break; - } - } + { + EW(Addr) d_addr = offset + p[i].p_vaddr + sizeof (EW(Dyn)) * j; + EW(Addr) off = E(r_debug_offset)(&dyn[j], memfd, d_addr); + if (off != 0) + { + struct E(r_debug) r; + if (pread (memfd, &r, sizeof (r), off) + != sizeof (r)) + error (EXIT_FAILURE, 0, gettext ("cannot read r_debug")); + + if (r.r_map != 0) + { + list = r.r_map; + break; + } + } + } free (dyn); break;