From: Topi Miettinen <toiwoton@gmail.com>
To: Matthew Wilcox <willy@infradead.org>
Cc: linux-hardening@vger.kernel.org, akpm@linux-foundation.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andy Lutomirski <luto@kernel.org>, Jann Horn <jannh@google.com>,
Kees Cook <keescook@chromium.org>,
Linux API <linux-api@vger.kernel.org>,
Mike Rapoport <rppt@kernel.org>
Subject: Re: [PATCH] mm/vmalloc: randomize vmalloc() allocations
Date: Wed, 2 Dec 2020 23:28:52 +0200 [thread overview]
Message-ID: <ddfe379a-915b-fca8-d191-e60e059e2dae@gmail.com> (raw)
In-Reply-To: <20201202185334.GG11935@casper.infradead.org>
On 2.12.2020 20.53, Matthew Wilcox wrote:
> On Tue, Dec 01, 2020 at 11:45:47PM +0200, Topi Miettinen wrote:
>> + /* Randomize allocation */
>> + if (randomize_vmalloc) {
>> + voffset = get_random_long() & (roundup_pow_of_two(vend - vstart) - 1);
>> + voffset = PAGE_ALIGN(voffset);
>> + if (voffset + size > vend - vstart)
>> + voffset = vend - vstart - size;
>> + } else
>> + voffset = 0;
>> +
>> /*
>> * If an allocation fails, the "vend" address is
>> * returned. Therefore trigger the overflow path.
>> */
>> - addr = __alloc_vmap_area(size, align, vstart, vend);
>> + addr = __alloc_vmap_area(size, align, vstart + voffset, vend);
>> spin_unlock(&free_vmap_area_lock);
>
> What if there isn't any free address space between vstart+voffset and
> vend, but there is free address space between vstart and voffset?
> Seems like we should add:
>
> addr = __alloc_vmap_area(size, align, vstart + voffset, vend);
> + if (!addr)
> + addr = __alloc_vmap_area(size, align, vstart, vend);
> spin_unlock(&free_vmap_area_lock);
>
How about:
addr = __alloc_vmap_area(size, align, vstart + voffset, vend);
+ if (!addr)
+ addr = __alloc_vmap_area(size, align, vstart, vstart + voffset + size);
spin_unlock(&free_vmap_area_lock);
That way the search would not be redone for the area that was already
checked and rejected.
Perhaps my previous patch for mmap() etc. randomization could also
search towards higher addresses instead of trying random addresses five
times in case of clashes.
-Topi
prev parent reply other threads:[~2020-12-02 21:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 21:45 [PATCH] mm/vmalloc: randomize vmalloc() allocations Topi Miettinen
2020-12-02 18:49 ` Topi Miettinen
2020-12-03 6:58 ` Mike Rapoport
2020-12-03 23:15 ` David Laight
2020-12-04 10:58 ` Topi Miettinen
2020-12-04 13:33 ` David Laight
2020-12-04 16:53 ` Topi Miettinen
2020-12-09 19:08 ` Topi Miettinen
2020-12-10 19:58 ` Topi Miettinen
2020-12-02 18:53 ` Matthew Wilcox
2020-12-02 21:28 ` Topi Miettinen [this message]
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=ddfe379a-915b-fca8-d191-e60e059e2dae@gmail.com \
--to=toiwoton@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=rppt@kernel.org \
--cc=willy@infradead.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).