From patchwork Fri Jan 28 21:17:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 50554 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 F024B382C401 for ; Fri, 28 Jan 2022 21:18:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F024B382C401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643404683; bh=fdIJaDySHxqM7Pu1bz7gSWXYIWxM0aLjw8pisJGiehs=; h=Subject:To:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=BN50S0fkydTD8WUYH4fJlomgITHWdwce02qPQB6WacVIpUaEgZsaMVEx9SwQ11gfd E7FMzggkFTrOTwJkdBcZin1zTmFigFYQysbPl8dDe3lRAceJrZh+MgstCOsP/+afdr HXeeg9ZEQvN+hccHKvEJoO1Fyh19yqK9rSpySr0M= 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 9C2A63858402 for ; Fri, 28 Jan 2022 21:17:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9C2A63858402 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 B839965BAE; Fri, 28 Jan 2022 16:17:39 -0500 (EST) Message-ID: <4a518e0d1c617e248074db7b0cd122d3c86bb058.camel@mengyan1223.wang> Subject: [PATCH v2] mips: pldd: support DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL To: GNU C Library Date: Sat, 29 Jan 2022 05:17:37 +0800 In-Reply-To: References: <046da3ae8fc57687b5a9480381904d3f53b1010f.camel@mengyan1223.wang> 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, KAM_SHORT, 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, Jiaxun Yang , Joseph Myers Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" [v2: remove useless typedef, seperate E(r_debug_offset) into a header.] MIPS uses DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL for accessing r_debug, instead of DT_DEBUG. Signed-off-by: Xi Ruoyao --- elf/pldd-xx.c | 34 +++++++++++++++----------- sysdeps/generic/elf-pldd-rdebug.h | 26 ++++++++++++++++++++ sysdeps/mips/elf-pldd-rdebug.h | 40 +++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 sysdeps/generic/elf-pldd-rdebug.h create mode 100644 sysdeps/mips/elf-pldd-rdebug.h diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c index 1cdfb49c53..368528371d 100644 --- a/elf/pldd-xx.c +++ b/elf/pldd-xx.c @@ -22,6 +22,8 @@ #define EW_(e, w, t) EW__(e, w, _##t) #define EW__(e, w, t) e##w##t +#include + struct E(link_map) { EW(Addr) l_addr; @@ -126,21 +128,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; diff --git a/sysdeps/generic/elf-pldd-rdebug.h b/sysdeps/generic/elf-pldd-rdebug.h new file mode 100644 index 0000000000..6df651cd55 --- /dev/null +++ b/sysdeps/generic/elf-pldd-rdebug.h @@ -0,0 +1,26 @@ +/* Function to access r_debug structure for pldd. + Copyright (C) 2020-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 + . */ + +static EW(Addr) +E(r_debug_offset) (EW(Dyn) *d, int, EW(Addr)) +{ + if (d->d_tag == DT_DEBUG) + return (EW(Addr)) d->d_un.d_ptr; + + return 0; +} diff --git a/sysdeps/mips/elf-pldd-rdebug.h b/sysdeps/mips/elf-pldd-rdebug.h new file mode 100644 index 0000000000..89a20c191a --- /dev/null +++ b/sysdeps/mips/elf-pldd-rdebug.h @@ -0,0 +1,40 @@ +/* Function to access r_debug structure for pldd, MIPS specific version. + Copyright (C) 2020-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 + . */ + +static EW(Addr) +E(r_debug_offset) (EW(Dyn) *d, int memfd, EW(Addr) d_addr) +{ + 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; +}