From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: Bill Wendling <morbo@google.com>
Cc: Mark Brown <broonie@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Kees Cook <keescook@google.com>, Ard Biesheuvel <ardb@kernel.org>,
Will Deacon <will@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-arm-kernel@lists.infradead.org,
Daniel Kiss <Daniel.Kiss@arm.com>
Subject: Re: [PATCH] arm64/vdso: Discard .note.gnu.property sections in vDSO
Date: Thu, 29 Apr 2021 10:50:28 +0100 [thread overview]
Message-ID: <20210429095027.GR9028@arm.com> (raw)
In-Reply-To: <CAGG=3QV0kR__23yEmwwXBpcE1gvjLqRNmF667hhVeY0B3urTqQ@mail.gmail.com>
The 04/29/2021 02:23, Bill Wendling wrote:
> On Thu, Apr 29, 2021 at 12:55 AM Szabolcs Nagy <szabolcs.nagy@arm.com> wrote:
> > The 04/28/2021 12:31, Bill Wendling wrote:
> > > On Wed, Apr 28, 2021 at 12:21 PM Bill Wendling <morbo@google.com> wrote:
> > > > On Wed, Apr 28, 2021 at 10:40 AM Mark Brown <broonie@kernel.org> wrote:
> > > > > On Wed, Apr 28, 2021 at 06:28:47PM +0100, Catalin Marinas wrote:
> > > > > > On Fri, Apr 23, 2021 at 01:51:59PM -0700, Bill Wendling wrote:
> > > > >
> > > > > > > Since the note.gnu.property section in the vDSO is not checked by the
> > > > > > > dynamic linker, discard the .note.gnu.property sections in the vDSO.
> > > > >
> > > > > > Can we not instead fix the linker script to preserve the
> > > > > > .note.gnu.property, correctly aligned? It doesn't take much space and
> > > > > > while we don't use it now, it has the BTI information about the binary.
> > > > >
> > > > > > Cc'ing a few others who were involved in the BTI support.
> > > > >
> > > > > Not just BTI, we also flag PAC usage in there too and could add other
> > > > > extensions going forwards. While the note isn't actively used by
> > > > > anything right now due to the kernel mapping the vDSO prior to userspace
> > > > > starting it is part of the ABI and something could end up wanting to use
> > > > > it and getting confused if it's not there. It would be much better to
> > > > > fix the alignment issue.
> > > >
> > > > If there's only one of the 8-byte aligned sections guaranteed, we
> > > > could place it first in the note. Otherwise, we will have to change
> > > > the alignment of the note (or somehow merge multiple notes).
> > > >
> > > I should have clarified that there's only one *entry* in the
> > > .note.gnu.properties section, and if not then is it possible to merge
> > > multiple entries into one. (Excuse my ignorance if this is already the
> > > case.)
> >
> > .note.gnu.property should go to PT_GNU_PROPERTY and it
> > should be merged following rules specified in
> > https://github.com/hjl-tools/linux-abi/wiki/Linux-Extensions-to-gABI
> > and
> > https://github.com/ARM-software/abi-aa/blob/master/aaelf64/aaelf64.rst#program-property
> >
> > it may also be covered by a (8byte aligned) PT_NOTE, but
> > that's not a requirement on aarch64 (x86 requires it for
> > compatibility with old dynamic linker, but since the vdso
> > is handled specially that may not be relevant either).
> >
> > i don't know how this works in linker scripts.
>
> This is a potential patch. I haven't had time to test it though.
> However, it does appear to format the section in the "expected" way,
> so one's able to grab the build IDs. Thoughts?
please show the program headers.
>
> $ objdump -s -j .note ./arch/arm64/kernel/vdso/vdso.so
>
> ./arch/arm64/kernel/vdso/vdso.so: file format elf64-little
>
> Contents of section .note:
> 0288 04000000 10000000 05000000 474e5500 ............GNU.
> 0298 000000c0 04000000 03000000 00000000 ................
> 02a8 06000000 04000000 00000000 4c696e75 ............Linu
> 02b8 78000000 000a0500 06000000 01000000 x...............
> 02c8 00010000 4c696e75 78000000 00000000 ....Linux.......
> 02d8 04000000 14000000 03000000 474e5500 ............GNU.
> 02e8 958db149 af5156cb 45309896 7a53ae8a ...I.QV.E0..zS..
> 02f8 ef34e95c .4.\
>
> diff --git a/arch/arm64/kernel/vdso/vdso.lds.S
> b/arch/arm64/kernel/vdso/vdso.lds.S
> index d808ad31e01f..d51e886c6223 100644
> --- a/arch/arm64/kernel/vdso/vdso.lds.S
> +++ b/arch/arm64/kernel/vdso/vdso.lds.S
> @@ -31,7 +31,13 @@ SECTIONS
> .gnu.version_d : { *(.gnu.version_d) }
> .gnu.version_r : { *(.gnu.version_r) }
>
> - .note : { *(.note.*) } :text :note
> + /*
> + * Add the .note.gnu.property section first, as it's aligned to
> + * 8-bytes, while other notes are aligned to 4-bytes.
> + */
> + . = ALIGN(8);
> +
> + .note : { *(.note.gnu.property) *(.note.*) } :text :note
>
> . = ALIGN(16);
--
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-29 9:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 20:51 [PATCH] arm64/vdso: Discard .note.gnu.property sections in vDSO Bill Wendling
2021-04-27 22:58 ` Kees Cook
2021-04-28 8:51 ` Ard Biesheuvel
2021-04-28 17:28 ` Catalin Marinas
2021-04-28 17:40 ` Mark Brown
2021-04-28 19:21 ` Bill Wendling
2021-04-28 19:31 ` Bill Wendling
2021-04-29 7:54 ` Szabolcs Nagy
2021-04-29 9:23 ` Bill Wendling
2021-04-29 9:50 ` Szabolcs Nagy [this message]
2021-04-29 18:52 ` Bill Wendling
2021-04-30 8:16 ` Szabolcs Nagy
2021-04-30 8:29 ` Bill Wendling
2021-04-30 17:57 ` Catalin Marinas
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=20210429095027.GR9028@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=Daniel.Kiss@arm.com \
--cc=ardb@kernel.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=keescook@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=morbo@google.com \
--cc=will@kernel.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 NNTP newsgroup(s).