From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id AC8B93852C5B; Wed, 23 Nov 2022 14:49:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC8B93852C5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214961; bh=aCJDofxzrMZgonWKcI3B0v9nDaLE+autlBYrXnwiiZ0=; h=From:To:Subject:Date:From; b=e4nADix4gStOIWNGyasaHJ9Xm8llFQdSuSEQLyyCPEuYLDTIIFinAV6tDcq0+5tgf JqW90TmFY8bI3pSxKipD/TUpoei3sTHISykPudkYOMLMh2Z0cDmd44EcAAV8AAgnhC gOfot8jvV7/lPguQLrWHF6EXQ91PYluodosDa2is= 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] cheri: elf: make sure dlpi_phdr covers the load segments X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 9d6a71514dee3ec6bdc6977339de5d31cbef8c4c X-Git-Newrev: 3e833b93fd62b42d02b65c51d081b10afc23e389 Message-Id: <20221123144921.AC8B93852C5B@sourceware.org> Date: Wed, 23 Nov 2022 14:49:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3e833b93fd62b42d02b65c51d081b10afc23e389 commit 3e833b93fd62b42d02b65c51d081b10afc23e389 Author: Szabolcs Nagy Date: Wed Sep 14 14:04:18 2022 +0100 cheri: elf: make sure dlpi_phdr covers the load segments In dl_iterate_phdr phdr is the only capability passed to the callback that may be used to derive pointers of the elf module, so ensure it has wide bounds. Diff: --- elf/dl-iteratephdr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index 146850b88a..bd2588fae8 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -69,7 +69,12 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, info.dlpi_addr = l->l_real->l_addr; #endif info.dlpi_name = l->l_real->l_name; +#ifdef __CHERI_PURE_CAPABILITY__ + ElfW(Addr) phdr = (ElfW(Addr)) l->l_real->l_phdr - l->l_real->l_addr; + info.dlpi_phdr = (const void *) dl_rx_ptr (l->l_real, phdr); +#else info.dlpi_phdr = l->l_real->l_phdr; +#endif info.dlpi_phnum = l->l_real->l_phnum; info.dlpi_adds = GL(dl_load_adds); info.dlpi_subs = GL(dl_load_adds) - nloaded;