From: Baoquan He <bhe@redhat.com>
To: keescook@chromium.org, yinghai@kernel.org, hpa@zytor.com,
mingo@redhat.com, bp@suse.de, matt.fleming@intel.com,
vgoyal@redhat.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, Baoquan He <bhe@redhat.com>
Subject: [Patch v3 4/7] x86, kaslr: Introduce fetch_random_virt_offset to randomize the kernel text mapping address
Date: Sun, 8 Mar 2015 13:38:52 +0800 [thread overview]
Message-ID: <1425793135-2833-5-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1425793135-2833-1-git-send-email-bhe@redhat.com>
Kaslr extended kernel text mapping region size from 512M to 1G,
namely CONFIG_RANDOMIZE_BASE_MAX_OFFSET. This means kernel text
can be mapped to below region:
[__START_KERNEL_map + LOAD_PHYSICAL_ADDR, __START_KERNEL_map + 1G]
Introduce a function find_random_virt_offset() to get random value
between LOAD_PHYSICAL_ADDR and CONFIG_RANDOMIZE_BASE_MAX_OFFSET.
This random value will be added to __START_KERNEL_map to get the
starting address which kernel text is mapped from. Since slot can
be anywhere of this region, means it is an independent slot_area,
it is simple to get a slot according to random value.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
arch/x86/boot/compressed/aslr.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index afb1641..0ca4c5b 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -382,6 +382,28 @@ static unsigned long find_random_addr(unsigned long minimum,
return slots_fetch_random();
}
+static unsigned long find_random_virt_offset(unsigned long minimum,
+ unsigned long image_size)
+{
+ unsigned long slot_num, random;
+
+ /* Make sure minimum is aligned. */
+ minimum = ALIGN(minimum, CONFIG_PHYSICAL_ALIGN);
+
+ if (image_size <= CONFIG_PHYSICAL_ALIGN)
+ slot_num = (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - minimum) /
+ CONFIG_PHYSICAL_ALIGN;
+ else
+ slot_num = (CONFIG_RANDOMIZE_BASE_MAX_OFFSET -
+ minimum - image_size) /
+ CONFIG_PHYSICAL_ALIGN + 1;
+
+ random = get_random_long() % slot_num;
+
+ return random * CONFIG_PHYSICAL_ALIGN + minimum;
+}
+
+
static void add_kaslr_setup_data(struct boot_params *params, __u8 enabled)
{
struct setup_data *data;
--
1.9.3
next prev parent reply other threads:[~2015-03-08 6:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-08 5:38 [Patch v3 0/7] randomize kernel physical address and virtual address separately Baoquan He
2015-03-08 5:38 ` [Patch v3 1/7] x86, kaslr: Fix a bug that relocation can not be handled when kernel is loaded above 2G Baoquan He
2015-03-08 5:38 ` [Patch v3 2/7] x86, kaslr: Introduce struct slot_area to manage randomization slot info Baoquan He
2015-03-08 5:38 ` [Patch v3 3/7] x86, kaslr: Add two functions which will be used later Baoquan He
2015-03-08 13:58 ` Alexander Kuleshov
2015-03-09 12:40 ` Baoquan He
2015-03-08 5:38 ` Baoquan He [this message]
2015-03-08 5:38 ` [Patch v3 5/7] x86, kaslr: Randomize physical and virtual address of kernel separately Baoquan He
2015-03-08 5:38 ` [Patch v3 6/7] x86, kaslr: Add support of kernel physical address randomization above 4G Baoquan He
2015-03-08 5:38 ` [Patch v3 7/7] x86, kaslr: Remove useless codes Baoquan He
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=1425793135-2833-5-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=vgoyal@redhat.com \
--cc=yinghai@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
all inboxes | Powered by JetHome®