From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 713383852C5F; Wed, 23 Nov 2022 14:48:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 713383852C5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214880; bh=DqvoqEQNxHPU4Dybl90O9gqdoY4q2B+sy2yJC7WJPe0=; h=From:To:Subject:Date:From; b=MDsKBhCB9ecGUvr59sWOa5gO4ZhI4Hk3pKHQB7xQxNTcf8jXqGvJpJ+Q67NT1oobb FvPJmgNI4dRl4b1c8kgGpU41YrvS+WairE7utCErficlBaeQam1QtZc44PbmKw3XOU cbaZI5TEg7Em+zCdLsrx5X5CSSahiXAs6K1v8Pi0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] aarch64: morello: add dl-r_debug.h X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: c14096c2d31897465acf062bfe8ce2ebc510b866 X-Git-Newrev: 10247e0d2fad3794c8443b78fc39a2e271fe15eb Message-Id: <20221123144800.713383852C5F@sourceware.org> Date: Wed, 23 Nov 2022 14:48:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=10247e0d2fad3794c8443b78fc39a2e271fe15eb commit 10247e0d2fad3794c8443b78fc39a2e271fe15eb Author: Szabolcs Nagy Date: Wed Sep 14 11:25:55 2022 +0100 aarch64: morello: add dl-r_debug.h Used internally for r_debug tests, but with the assumption that the return value can be dereferenced, so change the prototype and return a valid capability. Also used in pldd, where we only support purecap abi processes. Diff: --- sysdeps/aarch64/morello/dl-r_debug.h | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/sysdeps/aarch64/morello/dl-r_debug.h b/sysdeps/aarch64/morello/dl-r_debug.h new file mode 100644 index 0000000000..827609ff76 --- /dev/null +++ b/sysdeps/aarch64/morello/dl-r_debug.h @@ -0,0 +1,61 @@ +/* Function to access r_debug structure. Morello version. + 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 +#include + +static int +E(callback) (struct dl_phdr_info *info, size_t size, void *data) +{ + /* Assume phdr covers the load segments. */ + const void *phdr = info->dlpi_phdr; + uintptr_t *p = data; + unsigned long addr = *p; + unsigned long base = __builtin_cheri_base_get (phdr); + unsigned long len = __builtin_cheri_length_get (phdr); + if (addr - base >= len) + return 0; + *p = __builtin_cheri_address_set ((uintptr_t) phdr, addr); + return 1; +} + +/* Return a valid runtime pointer to r_debug instead of an address since + that's how this function is used despite its generic prototype. + Assume the lookup is for the main exe and return uintptr_t type. */ + +static inline uintptr_t +E(r_debug_address) (ElfW(Dyn) *d) +{ + if (d->d_tag != DT_DEBUG) + return 0; + uintptr_t p = d->d_un.d_ptr; + if (dl_iterate_phdr (E(callback), &p) == 1) + return p; + return 0; +} + +/* Return the offset of the struct r_debug before relocation. */ + +static inline EW(Addr) +E(r_debug_offset) (EW(Dyn) *d, int fd, EW(Addr) offset) +{ + if (d->d_tag == DT_DEBUG) + return (EW(Addr)) d->d_un.d_ptr; + + return 0; +}