From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH] aarch64: Respect p_flags when protecting code with PROT_BTI
Date: Fri, 17 Jul 2020 15:52:19 +0100 [thread overview]
Message-ID: <20200717145218.GE7127@arm.com> (raw)
In-Reply-To: <20200715154444.GA26693@arm.com>
The 07/15/2020 16:44, Szabolcs Nagy wrote:
> i'd like to commit the attached patch for 2.32
ping.
or can i commit such a patch as a bug fix?
> From af3c11a811cfcc2b72f07efa0696c2200e928e12 Mon Sep 17 00:00:00 2001
> From: Szabolcs Nagy <szabolcs.nagy@arm.com>
> Date: Mon, 13 Jul 2020 11:28:18 +0100
> Subject: [PATCH] aarch64: Respect p_flags when protecting code with PROT_BTI
>
> Use PROT_READ and PROT_WRITE according to the load segment p_flags
> when adding PROT_BTI.
>
> This is before processing relocations which may drop PROT_BTI in
> case of textrels. Executable stacks are not protected via PROT_BTI
> either. PROT_BTI is hardening in case memory corruption happened,
> it's value is reduced if there is writable and executable memory
> available so missing it on such memory is fine, but we should
> respect the p_flags and should not drop PROT_WRITE.
> ---
> sysdeps/aarch64/dl-bti.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c
> index 965ddcc732..196e462520 100644
> --- a/sysdeps/aarch64/dl-bti.c
> +++ b/sysdeps/aarch64/dl-bti.c
> @@ -24,13 +24,20 @@ static int
> enable_bti (struct link_map *map, const char *program)
> {
> const ElfW(Phdr) *phdr;
> - unsigned prot = PROT_READ | PROT_EXEC | PROT_BTI;
> + unsigned prot;
>
> for (phdr = map->l_phdr; phdr < &map->l_phdr[map->l_phnum]; ++phdr)
> if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X))
> {
> void *start = (void *) (phdr->p_vaddr + map->l_addr);
> size_t len = phdr->p_memsz;
> +
> + prot = PROT_EXEC | PROT_BTI;
> + if (phdr->p_flags & PF_R)
> + prot |= PROT_READ;
> + if (phdr->p_flags & PF_W)
> + prot |= PROT_WRITE;
> +
> if (__mprotect (start, len, prot) < 0)
> {
> if (program)
> --
> 2.17.1
>
--
next prev parent reply other threads:[~2020-07-17 14:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 15:44 Szabolcs Nagy
2020-07-17 14:52 ` Szabolcs Nagy [this message]
2020-07-23 12:17 ` Szabolcs Nagy
2020-07-23 21:25 ` Carlos O'Donell
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=20200717145218.GE7127@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).