From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id AEA95384B806; Wed, 26 Oct 2022 15:12:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEA95384B806 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797174; bh=z06+fFa/MXqotGHoxq2n+HzwkR2bAJXKc23Nuaz8kwA=; h=From:To:Subject:Date:From; b=g/gI33E7IAEmXbEidVwe/oIUGWkkgS8ePafqO4tq6cEjP95KSH5sS7mHmByLonVph RZe07UO3lyGY8IJvvpsPrKLmryqfkeRkYVfTrQDsplkKqEAC3fvpV/BnWCbzO5WEaW H7sHXfMHVqX4rCwqyNKXlJvnPy9cUPD8axwYeFqM= 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] TODO(gcc): cheri: work around a gcc bug in _dl_setup_stack_chk_guard X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 33b3cf3fd81dd4fbddf718c74bd9898d866dbd4f X-Git-Newrev: f64bf6dfe6c3852bb80fae6b69ca2c867e874ab0 Message-Id: <20221026151254.AEA95384B806@sourceware.org> Date: Wed, 26 Oct 2022 15:12:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f64bf6dfe6c3852bb80fae6b69ca2c867e874ab0 commit f64bf6dfe6c3852bb80fae6b69ca2c867e874ab0 Author: Szabolcs Nagy Date: Fri Jul 15 19:33:23 2022 +0100 TODO(gcc): cheri: work around a gcc bug in _dl_setup_stack_chk_guard morello purecap gcc in some cases inlines 16byte memcpy as a capability load, which is wrong if the source or dest may be unaligned. stack guard only needs random for the address portion since only that part is compared, so 8 byte is enough with 64 bit addresses, but the current code is only right on little endian systems. TODO: drop when gcc is fixed Diff: --- sysdeps/unix/sysv/linux/dl-osinfo.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index 7888915f12..49d8f973c8 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -34,7 +34,11 @@ _dl_setup_stack_chk_guard (void *dl_random) /* We need in the moment only 8 bytes on 32-bit platforms and 16 bytes on 64-bit platforms. Therefore we can use the data directly and not use the kernel-provided data to seed a PRNG. */ +#ifdef __CHERI_PURE_CAPABILITY__ + memcpy (ret.bytes, dl_random, 8); +#else memcpy (ret.bytes, dl_random, sizeof (ret)); +#endif #if BYTE_ORDER == LITTLE_ENDIAN ret.num &= ~(uintptr_t) 0xff; #elif BYTE_ORDER == BIG_ENDIAN