From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 264143853D7E; Wed, 23 Nov 2022 14:45:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 264143853D7E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214723; bh=ghhjd4HBmyzk/bVj3Z7Y/1/KzCbdpftbSnkRNoeR2nY=; h=From:To:Subject:Date:From; b=y4jnOJbzvf373R/iqpUzRr/tOL//nx/mLH7x+irOcteBTMQKceTLR3ZGhaKwopC3g T95LDf+IGAj9lvD7pemPS4PBlGzvgou5Z8hRuMDX7xq6f+YcF6RYcLTJMLXbXHpB3v cO+oK5NtfCAtnwC36K96zX6+fJXGtYyYQKhW+9RE= 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: Setup RX, RW capabilities for static linking X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 055042833f84bad40aacb4f952eae63351cf5fb3 X-Git-Newrev: 90c5142f771b318dc905faf02162a01b8f546460 Message-Id: <20221123144523.264143853D7E@sourceware.org> Date: Wed, 23 Nov 2022 14:45:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=90c5142f771b318dc905faf02162a01b8f546460 commit 90c5142f771b318dc905faf02162a01b8f546460 Author: Szabolcs Nagy Date: Wed Sep 7 10:38:29 2022 +0100 cheri: Setup RX, RW capabilities for static linking At least tls image access requires RX capability of the main link_map. Diff: --- elf/dl-support.c | 5 +++++ sysdeps/unix/sysv/linux/dl-parse_auxv.h | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/elf/dl-support.c b/elf/dl-support.c index 4af0b5b2ce..ffc1d8d01b 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -255,6 +255,11 @@ _dl_aux_init (ElfW(auxv_t) *av) for (int i = 0; i < array_length (auxv_values); ++i) auxv_values[i] = 0; _dl_parse_auxv (av, auxv_values); + +# ifdef __CHERI_PURE_CAPABILITY__ + _dl_main_map.l_map_start = auxv_values[AT_CHERI_EXEC_RX_CAP]; + _dl_main_map.l_rw_start = auxv_values[AT_CHERI_EXEC_RW_CAP]; +# endif } #endif diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h index 48ca7736a0..a0770b4412 100644 --- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h +++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h @@ -22,7 +22,12 @@ #include #include -typedef elfptr_t dl_parse_auxv_t[AT_MINSIGSTKSZ + 1]; +#ifdef __CHERI_PURE_CAPABILITY__ +# define AT_MAX AT_ENVP +#else +# define AT_MAX AT_MINSIGSTKSZ +#endif +typedef elfptr_t dl_parse_auxv_t[AT_MAX + 1]; /* Copy the auxiliary vector into AUXV_VALUES and set up GLRO variables. */ @@ -39,7 +44,7 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) auxv_values[AT_MINSIGSTKSZ] = CONSTANT_MINSIGSTKSZ; for (; av->a_type != AT_NULL; av++) - if (av->a_type <= AT_MINSIGSTKSZ) + if (av->a_type <= AT_MAX) auxv_values[av->a_type] = av->a_un.a_val; GLRO(dl_pagesize) = auxv_values[AT_PAGESZ];