From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [PATCH] elf: align AT_RANDOM bytes
Date: Thu, 30 May 2019 00:37:08 +0300 [thread overview]
Message-ID: <20190529213708.GA10729@avx2> (raw)
AT_RANDOM content is always misaligned on x86_64:
$ LD_SHOW_AUXV=1 /bin/true | grep AT_RANDOM
AT_RANDOM: 0x7fff02101019
glibc copies first few bytes for stack protector stuff, aligned
access should be slightly faster.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
fs/binfmt_elf.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -144,11 +144,15 @@ static int padzero(unsigned long elf_bss)
#define STACK_ALLOC(sp, len) ({ \
elf_addr_t __user *old_sp = (elf_addr_t __user *)sp; sp += len; \
old_sp; })
+#define STACK_ALIGN(sp, align) \
+ ((typeof(sp))(((unsigned long)sp + (int)align - 1) & ~((int)align - 1)))
#else
#define STACK_ADD(sp, items) ((elf_addr_t __user *)(sp) - (items))
#define STACK_ROUND(sp, items) \
(((unsigned long) (sp - items)) &~ 15UL)
#define STACK_ALLOC(sp, len) ({ sp -= len ; sp; })
+#define STACK_ALIGN(sp, align) \
+ ((typeof(sp))((unsigned long)sp & ~((int)align - 1)))
#endif
#ifndef ELF_BASE_PLATFORM
@@ -217,6 +221,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
return -EFAULT;
}
+ /*
+ * glibc copies first bytes for stack protector purposes
+ * which are misaligned on x86_64 because strlen("x86_64") + 1 == 7.
+ */
+ p = STACK_ALIGN(p, sizeof(long));
+
/*
* Generate 16 random bytes for userspace PRNG seeding.
*/
next reply other threads:[~2019-05-29 21:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 21:37 Alexey Dobriyan [this message]
2019-05-29 22:20 ` [PATCH] elf: align AT_RANDOM bytes Andrew Morton
2019-05-29 23:00 ` Kees Cook
2019-05-30 6:47 ` Alexey Dobriyan
2019-05-30 6:44 ` Alexey Dobriyan
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=20190529213708.GA10729@avx2 \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.