From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 299D43856DF8; Fri, 5 Aug 2022 19:36:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 299D43856DF8 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: fix pointer provenance of l_tls_initimage X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 06fda784450ff505a14c0af87a5c68e153b08b31 X-Git-Newrev: 2b1192cae03642b2cb16f918322f5cddfc54eae2 Message-Id: <20220805193636.299D43856DF8@sourceware.org> Date: Fri, 5 Aug 2022 19:36:36 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:36:36 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2b1192cae03642b2cb16f918322f5cddfc54eae2 commit 2b1192cae03642b2cb16f918322f5cddfc54eae2 Author: Szabolcs Nagy Date: Thu Apr 7 17:04:59 2022 +0100 cheri: elf: fix pointer provenance of l_tls_initimage Diff: --- elf/dl-load.c | 2 +- elf/rtld.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 1ad0868dad..367b8cdab1 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1369,7 +1369,7 @@ cannot enable executable stack as shared object requires"); /* Adjust the address of the TLS initialization image. */ if (l->l_tls_initimage != NULL) - l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_addr; + l->l_tls_initimage = (ElfW(Addr)) l->l_tls_initimage + (char *) l->l_addr; /* Process program headers again after load segments are mapped in case processing requires accessing those segments. Scan program diff --git a/elf/rtld.c b/elf/rtld.c index 2c61935a21..6ba7b94761 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1274,7 +1274,7 @@ rtld_setup_main_map (struct link_map *main_map) the executable is actually an ET_DYN object. */ if (main_map->l_tls_initimage != NULL) main_map->l_tls_initimage - = (char *) main_map->l_tls_initimage + main_map->l_addr; + = (ElfW(Addr)) main_map->l_tls_initimage + (char *) main_map->l_addr; if (! main_map->l_map_end) main_map->l_map_end = ~0; if (! main_map->l_text_end)