From: Andy Lutomirski <luto@amacapital.net> To: Borislav Petkov <bp@alien8.de> Cc: Dmitry Safonov <dsafonov@virtuozzo.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Dmitry Safonov <0x7f454c46@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>, X86 ML <x86@kernel.org>, "linux-mm@kvack.org" <linux-mm@kvack.org> Subject: Re: [PATCHv4 1/5] x86/mm: split arch_mmap_rnd() on compat/native versions Date: Thu, 9 Feb 2017 15:06:22 -0800 [thread overview] Message-ID: <CALCETrVUXCsNsvy_xTzok9Jd6tpNtOTiyDsz9MWgYTo1V1LMtw@mail.gmail.com> (raw) In-Reply-To: <20170209135525.qlwrmlo7njk3fsaq@pd.tnic> On Thu, Feb 9, 2017 at 5:55 AM, Borislav Petkov <bp@alien8.de> wrote: > On Mon, Jan 30, 2017 at 03:04:28PM +0300, Dmitry Safonov wrote: >> I need those arch_{native,compat}_rnd() to compute separately >> random factor for mmap() in compat syscalls for 64-bit binaries >> and vice-versa for native syscall in 32-bit compat binaries. >> They will be used in the following patches. >> >> Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> >> --- >> arch/x86/mm/mmap.c | 25 ++++++++++++++++--------- >> 1 file changed, 16 insertions(+), 9 deletions(-) >> >> diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c >> index d2dc0438d654..42063e787717 100644 >> --- a/arch/x86/mm/mmap.c >> +++ b/arch/x86/mm/mmap.c >> @@ -65,20 +65,27 @@ static int mmap_is_legacy(void) >> return sysctl_legacy_va_layout; >> } >> >> -unsigned long arch_mmap_rnd(void) >> +#ifdef CONFIG_COMPAT >> +static unsigned long arch_compat_rnd(void) >> { >> - unsigned long rnd; >> + return (get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1)) >> + << PAGE_SHIFT; >> +} >> +#endif >> >> - if (mmap_is_ia32()) >> +static unsigned long arch_native_rnd(void) >> +{ >> + return (get_random_long() & ((1UL << mmap_rnd_bits) - 1)) << PAGE_SHIFT; >> +} >> + >> +unsigned long arch_mmap_rnd(void) >> +{ >> #ifdef CONFIG_COMPAT >> - rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); >> -#else >> - rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); >> + if (mmap_is_ia32()) >> + return arch_compat_rnd(); >> #endif > > I can't say that I'm thrilled about the ifdeffery this is adding. > > But I can't think of a cleaner approach at a quick glance, though - > that's generic and arch-specific code intertwined muck. Sad face. I can, but it could be considerably more churn: get rid of the compat/native split and do a 32-bit/64-bit split instead. > > -- > Regards/Gruss, > Boris. > > Good mailing practices for 400: avoid top-posting and trim the reply. -- Andy Lutomirski AMA Capital Management, LLC
WARNING: multiple messages have this Message-ID (diff)
From: Andy Lutomirski <luto@amacapital.net> To: Borislav Petkov <bp@alien8.de> Cc: Dmitry Safonov <dsafonov@virtuozzo.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Dmitry Safonov <0x7f454c46@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>, X86 ML <x86@kernel.org>, "linux-mm@kvack.org" <linux-mm@kvack.org> Subject: Re: [PATCHv4 1/5] x86/mm: split arch_mmap_rnd() on compat/native versions Date: Thu, 9 Feb 2017 15:06:22 -0800 [thread overview] Message-ID: <CALCETrVUXCsNsvy_xTzok9Jd6tpNtOTiyDsz9MWgYTo1V1LMtw@mail.gmail.com> (raw) In-Reply-To: <20170209135525.qlwrmlo7njk3fsaq@pd.tnic> On Thu, Feb 9, 2017 at 5:55 AM, Borislav Petkov <bp@alien8.de> wrote: > On Mon, Jan 30, 2017 at 03:04:28PM +0300, Dmitry Safonov wrote: >> I need those arch_{native,compat}_rnd() to compute separately >> random factor for mmap() in compat syscalls for 64-bit binaries >> and vice-versa for native syscall in 32-bit compat binaries. >> They will be used in the following patches. >> >> Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> >> --- >> arch/x86/mm/mmap.c | 25 ++++++++++++++++--------- >> 1 file changed, 16 insertions(+), 9 deletions(-) >> >> diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c >> index d2dc0438d654..42063e787717 100644 >> --- a/arch/x86/mm/mmap.c >> +++ b/arch/x86/mm/mmap.c >> @@ -65,20 +65,27 @@ static int mmap_is_legacy(void) >> return sysctl_legacy_va_layout; >> } >> >> -unsigned long arch_mmap_rnd(void) >> +#ifdef CONFIG_COMPAT >> +static unsigned long arch_compat_rnd(void) >> { >> - unsigned long rnd; >> + return (get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1)) >> + << PAGE_SHIFT; >> +} >> +#endif >> >> - if (mmap_is_ia32()) >> +static unsigned long arch_native_rnd(void) >> +{ >> + return (get_random_long() & ((1UL << mmap_rnd_bits) - 1)) << PAGE_SHIFT; >> +} >> + >> +unsigned long arch_mmap_rnd(void) >> +{ >> #ifdef CONFIG_COMPAT >> - rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); >> -#else >> - rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); >> + if (mmap_is_ia32()) >> + return arch_compat_rnd(); >> #endif > > I can't say that I'm thrilled about the ifdeffery this is adding. > > But I can't think of a cleaner approach at a quick glance, though - > that's generic and arch-specific code intertwined muck. Sad face. I can, but it could be considerably more churn: get rid of the compat/native split and do a 32-bit/64-bit split instead. > > -- > Regards/Gruss, > Boris. > > Good mailing practices for 400: avoid top-posting and trim the reply. -- Andy Lutomirski AMA Capital Management, LLC -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-02-09 23:06 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-30 12:04 [PATCHv4 0/5] Fix compatible mmap() return pointer over 4Gb Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-01-30 12:04 ` [PATCHv4 1/5] x86/mm: split arch_mmap_rnd() on compat/native versions Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-02-09 13:55 ` Borislav Petkov 2017-02-09 23:06 ` Andy Lutomirski [this message] 2017-02-09 23:06 ` Andy Lutomirski 2017-02-10 20:10 ` Thomas Gleixner 2017-02-10 20:10 ` Thomas Gleixner 2017-02-10 20:25 ` Borislav Petkov 2017-02-10 20:25 ` Borislav Petkov 2017-02-10 21:28 ` Dmitry Safonov 2017-02-10 21:28 ` Dmitry Safonov 2017-02-11 8:23 ` Thomas Gleixner 2017-02-11 8:23 ` Thomas Gleixner 2017-02-13 11:12 ` Dmitry Safonov 2017-02-13 11:12 ` Dmitry Safonov 2017-02-13 11:22 ` Thomas Gleixner 2017-02-13 11:22 ` Thomas Gleixner 2017-01-30 12:04 ` [PATCHv4 2/5] x86/mm: introduce mmap{,_legacy}_base Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-02-11 14:13 ` Thomas Gleixner 2017-02-11 14:13 ` Thomas Gleixner 2017-02-13 13:02 ` Dmitry Safonov 2017-02-13 13:02 ` Dmitry Safonov 2017-02-13 13:13 ` Thomas Gleixner 2017-02-13 13:13 ` Thomas Gleixner 2017-02-13 14:37 ` Dmitry Safonov 2017-02-13 14:37 ` Dmitry Safonov 2017-02-13 15:35 ` Thomas Gleixner 2017-02-13 15:35 ` Thomas Gleixner 2017-01-30 12:04 ` [PATCHv4 3/5] x86/mm: fix 32-bit mmap() for 64-bit ELF Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-02-11 19:49 ` Thomas Gleixner 2017-02-11 19:49 ` Thomas Gleixner 2017-02-14 15:24 ` Dmitry Safonov 2017-02-14 15:24 ` Dmitry Safonov 2017-01-30 12:04 ` [PATCHv4 4/5] x86/mm: check in_compat_syscall() instead TIF_ADDR32 for mmap(MAP_32BIT) Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-02-11 20:13 ` Thomas Gleixner 2017-02-11 20:13 ` Thomas Gleixner 2017-02-14 16:11 ` Dmitry Safonov 2017-02-14 16:11 ` Dmitry Safonov 2017-02-14 16:14 ` Dmitry Safonov 2017-02-14 16:14 ` Dmitry Safonov 2017-01-30 12:04 ` [PATCHv4 5/5] selftests/x86: add test to check compat mmap() return addr Dmitry Safonov 2017-01-30 12:04 ` Dmitry Safonov 2017-02-06 16:46 ` [PATCHv4 0/5] Fix compatible mmap() return pointer over 4Gb Dmitry Safonov 2017-02-06 16:46 ` Dmitry Safonov
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=CALCETrVUXCsNsvy_xTzok9Jd6tpNtOTiyDsz9MWgYTo1V1LMtw@mail.gmail.com \ --to=luto@amacapital.net \ --cc=0x7f454c46@gmail.com \ --cc=bp@alien8.de \ --cc=bp@suse.de \ --cc=dsafonov@virtuozzo.com \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@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: linkBe 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.