From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: yinghai@kernel.org, keescook@chromium.org, hpa@zytor.com,
mingo@redhat.com, bp@alien8.de, vgoyal@redhat.com,
luto@kernel.org, lasse.collin@tukaani.org,
akpm@linux-foundation.org, dyoung@redhat.com
Subject: [PATCH v4 01/20] x86, kaslr: Remove not needed parameter for choose_kernel_location
Date: Tue, 22 Mar 2016 15:31:58 +0800 [thread overview]
Message-ID: <1458631937-14593-2-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1458631937-14593-1-git-send-email-bhe@redhat.com>
From: Yinghai Lu <yinghai@kernel.org>
real_mode is global variable, so we do not need to pass it around.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
---
arch/x86/boot/compressed/aslr.c | 5 ++---
arch/x86/boot/compressed/misc.c | 2 +-
arch/x86/boot/compressed/misc.h | 6 ++----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index 6a9b96b..622aa88 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -295,8 +295,7 @@ static unsigned long find_random_addr(unsigned long minimum,
return slots_fetch_random();
}
-unsigned char *choose_kernel_location(struct boot_params *boot_params,
- unsigned char *input,
+unsigned char *choose_kernel_location(unsigned char *input,
unsigned long input_size,
unsigned char *output,
unsigned long output_size)
@@ -316,7 +315,7 @@ unsigned char *choose_kernel_location(struct boot_params *boot_params,
}
#endif
- boot_params->hdr.loadflags |= KASLR_FLAG;
+ real_mode->hdr.loadflags |= KASLR_FLAG;
/* Record the various known unsafe memory ranges. */
mem_avoid_init((unsigned long)input, input_size,
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 79dac17..f35ad9e 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -428,7 +428,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
* the entire decompressed kernel plus relocation table, or the
* entire decompressed kernel plus .bss and .brk sections.
*/
- output = choose_kernel_location(real_mode, input_data, input_len, output,
+ output = choose_kernel_location(input_data, input_len, output,
output_len > run_size ? output_len
: run_size);
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 3783dc3..dcf01c2 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -67,8 +67,7 @@ int cmdline_find_option_bool(const char *option);
#if CONFIG_RANDOMIZE_BASE
/* aslr.c */
-unsigned char *choose_kernel_location(struct boot_params *boot_params,
- unsigned char *input,
+unsigned char *choose_kernel_location(unsigned char *input,
unsigned long input_size,
unsigned char *output,
unsigned long output_size);
@@ -76,8 +75,7 @@ unsigned char *choose_kernel_location(struct boot_params *boot_params,
bool has_cpuflag(int flag);
#else
static inline
-unsigned char *choose_kernel_location(struct boot_params *boot_params,
- unsigned char *input,
+unsigned char *choose_kernel_location(unsigned char *input,
unsigned long input_size,
unsigned char *output,
unsigned long output_size)
--
2.5.0
next prev parent reply other threads:[~2016-03-22 7:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 7:31 [PATCH v4 00/20] x86, boot: kaslr cleanup and 64bit kaslr support Baoquan He
2016-03-22 7:31 ` Baoquan He [this message]
2016-03-22 7:31 ` [PATCH v4 02/20] x86, kaslr: Fix a bug that relocation can not be handled when kernel is loaded above 2G Baoquan He
2016-03-22 7:32 ` [PATCH v4 03/20] x86, boot: Move compressed kernel to end of buffer before decompressing Baoquan He
2016-03-22 7:32 ` [PATCH v4 04/20] x86, boot: Move z_extract_offset calculation to header.S Baoquan He
2016-03-22 7:32 ` [PATCH v4 05/20] x86, kaskr: Update the description for decompressor worst case Baoquan He
2016-03-22 7:32 ` [PATCH v4 06/20] x86, boot: Fix run_size calculation Baoquan He
2016-03-22 20:51 ` Kees Cook
2016-03-22 7:32 ` [PATCH v4 07/20] x86, kaslr: Clean up useless code related to run_size Baoquan He
2016-03-22 20:52 ` Kees Cook
2016-03-22 7:32 ` [PATCH v4 08/20] x86, kaslr: Get correct max_addr for relocs pointer Baoquan He
2016-03-22 20:52 ` Kees Cook
2016-03-22 7:32 ` [PATCH v4 09/20] x86, kaslr: Consolidate mem_avoid array filling Baoquan He
2016-03-22 7:32 ` [PATCH v4 10/20] x86, boot: Split kernel_ident_mapping_init to another file Baoquan He
2016-03-22 7:32 ` [PATCH v4 11/20] x86, 64bit: Set ident_mapping for kaslr Baoquan He
2016-04-13 10:05 ` Ingo Molnar
2016-03-22 7:32 ` [PATCH v4 12/20] x86, boot: Add checking for memcpy Baoquan He
2016-03-22 7:32 ` [PATCH v4 13/20] x86, kaslr: Introduce struct slot_area to manage randomization slot info Baoquan He
2016-03-22 7:32 ` [PATCH v4 14/20] x86, kaslr: Add two functions which will be used later Baoquan He
2016-03-22 7:32 ` [PATCH v4 15/20] x86, kaslr: Introduce fetch_random_virt_offset to randomize the kernel text mapping address Baoquan He
2016-03-22 7:32 ` [PATCH v4 16/20] x86, kaslr: Randomize physical and virtual address of kernel separately Baoquan He
2016-03-22 7:32 ` [PATCH v4 17/20] x86, kaslr: Add support of kernel physical address randomization above 4G Baoquan He
2016-03-22 7:32 ` [PATCH v4 18/20] x86, kaslr: Remove useless codes Baoquan He
2016-03-22 7:32 ` [PATCH v4 19/20] x86, kaslr: Allow random address to be below loaded address Baoquan He
2016-03-22 19:54 ` Kees Cook
2016-03-23 1:41 ` Baoquan He
2016-03-23 8:59 ` [PATCH v5 " Baoquan He
2016-03-22 7:32 ` [PATCH v4 20/20] x86, kaslr: Use KERNEL_IMAGE_SIZE as the offset max for kernel virtual randomization Baoquan He
2016-03-22 20:46 ` Kees Cook
2016-03-22 20:25 ` [PATCH v4 00/20] x86, boot: kaslr cleanup and 64bit kaslr support Kees Cook
2016-03-23 22:40 ` Kees Cook
2016-04-05 1:56 ` Baoquan He
2016-04-05 20:00 ` Kees Cook
2016-04-13 10:19 ` Ingo Molnar
2016-04-13 14:11 ` Kees Cook
2016-04-14 6:02 ` Kees Cook
2016-04-14 6:24 ` Baoquan He
2016-04-14 15:06 ` Baoquan He
2016-04-14 17:56 ` Kees Cook
2016-04-15 4:08 ` Baoquan He
2016-04-15 4:52 ` Kees Cook
2016-04-15 6:55 ` Ingo Molnar
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=1458631937-14593-2-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=dyoung@redhat.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=lasse.collin@tukaani.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).