From: jvoisin <julien.voisin@dustri.org>
To: musl@lists.openwall.com
Cc: jvoisin <julien.voisin@dustri.org>
Subject: [musl] [PATCH] Zero the leading stack canary byte
Date: Mon, 13 Dec 2021 21:05:19 +0100 [thread overview]
Message-ID: <20211213200519.117056-1-julien.voisin@dustri.org> (raw)
In-Reply-To: <20211213142353.GG7074@brightrain.aerifal.cx>
This reduces entropy of the canary from 64-bit to 56-bit in exchange for
mitigating non-terminated C string overflows by setting the second byte
of the canary to NULL, so that off-by-one can still be detected.
This is taken from https://github.com/GrapheneOS/platform_bionic/commit/7024d880b51f03a796ff8832f1298f2f1531fd7b
---
src/env/__stack_chk_fail.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index bf5a280a..be31a88a 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -9,6 +9,14 @@ void __init_ssp(void *entropy)
if (entropy) memcpy(&__stack_chk_guard, entropy, sizeof(uintptr_t));
else __stack_chk_guard = (uintptr_t)&__stack_chk_guard * 1103515245;
+#if UINTPTR_MAX >= 0xffffffffffffffff
+ /* Sacrifice 8 bits of entropy on 64bit to prevent leaking/overwriting the
+ * canary via string-manipulation functions. The NULL byte is on the second
+ * byte so that off-by-ones can still be detected. Endianness is taken care
+ * of automatically. */
+ ((char *)&__stack_chk_guard)[1] = 0;
+#endif
+
__pthread_self()->canary = __stack_chk_guard;
}
--
2.30.2
prev parent reply other threads:[~2021-12-13 20:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-12 18:34 jvoisin
2021-12-12 19:35 ` Rich Felker
2021-12-13 12:24 ` jvoisin
2021-12-13 14:23 ` Rich Felker
2021-12-13 20:05 ` jvoisin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211213200519.117056-1-julien.voisin@dustri.org \
--to=julien.voisin@dustri.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).