From: Dmitry Safonov <dsafonov@virtuozzo.com>
To: Oleg Nesterov <oleg@redhat.com>, Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>,
Cyrill Gorcunov <gorcunov@openvz.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] x86/elf: remove the unnecessary ADDR_NO_RANDOMIZE checks in stack_maxrandom_size() and randomize_stack_top()
Date: Mon, 10 Jul 2017 14:58:24 +0300 [thread overview]
Message-ID: <7250417d-e0c7-7506-92b7-10e9088f5184@virtuozzo.com> (raw)
In-Reply-To: <20170710111458.GA20047@redhat.com>
On 07/10/2017 02:14 PM, Oleg Nesterov wrote:
> PF_RANDOMIZE is set by load_elf_binary() only if ADDR_NO_RANDOMIZE is not
> set, no need to re-check after that.that.that.that.that.that.that.that.
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
> ---
> arch/x86/mm/mmap.c | 3 +--
> fs/binfmt_elf.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
> index 6369d04..81db3e9 100644
> --- a/arch/x86/mm/mmap.c
> +++ b/arch/x86/mm/mmap.c
> @@ -50,8 +50,7 @@ unsigned long tasksize_64bit(void)
> static unsigned long stack_maxrandom_size(unsigned long task_size)
> {
> unsigned long max = 0;
> - if ((current->flags & PF_RANDOMIZE) &&
> - !(current->personality & ADDR_NO_RANDOMIZE)) {
> + if (current->flags & PF_RANDOMIZE) {
> max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit());
> max <<= PAGE_SHIFT;
> }
> diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
> index 5075fd5..569c82e 100644
> --- a/fs/binfmt_elf.c
> +++ b/fs/binfmt_elf.c
> @@ -666,8 +666,7 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
> {
> unsigned long random_variable = 0;
>
> - if ((current->flags & PF_RANDOMIZE) &&
> - !(current->personality & ADDR_NO_RANDOMIZE)) {
> + if (current->flags & PF_RANDOMIZE) {
> random_variable = get_random_long();
> random_variable &= STACK_RND_MASK;
> random_variable <<= PAGE_SHIFT;
>
--
Dmitry
next prev parent reply other threads:[~2017-07-10 11:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 11:14 [PATCH 1/2] x86: fix norandmaps Oleg Nesterov
2017-07-10 11:14 ` [PATCH 2/2] x86/elf: remove the unnecessary ADDR_NO_RANDOMIZE checks in stack_maxrandom_size() and randomize_stack_top() Oleg Nesterov
2017-07-10 11:58 ` Dmitry Safonov [this message]
2017-07-10 11:56 ` [PATCH 1/2] x86: fix norandmaps Dmitry Safonov
2017-07-20 16:42 ` Oleg Nesterov
2017-08-14 16:24 ` Kirill A. Shutemov
2017-08-14 16:43 ` Oleg Nesterov
2017-08-14 16:44 ` Cyrill Gorcunov
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=7250417d-e0c7-7506-92b7-10e9088f5184@virtuozzo.com \
--to=dsafonov@virtuozzo.com \
--cc=bp@suse.de \
--cc=gorcunov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®