mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 14:43:03 +00:00
e6023367d7
When choosing a random address, the current implementation does not take into
account the reversed space for .bss and .brk sections. Thus the relocated kernel
may overlap other components in memory. Here is an example of the overlap from a
x86_64 kernel in qemu (the ranges of physical addresses are presented):
Physical Address
0x0fe00000 --+--------------------+ <-- randomized base
/ | relocated kernel |
vmlinux.bin | (from vmlinux.bin) |
0x1336d000 (an ELF file) +--------------------+--
\ | | \
0x1376d870 --+--------------------+ |
| relocs table | |
0x13c1c2a8 +--------------------+ .bss and .brk
| | |
0x13ce6000 +--------------------+ |
| | /
0x13f77000 | initrd |--
| |
0x13fef374 +--------------------+
The initrd image will then be overwritten by the memset during early
initialization:
[ 1.655204] Unpacking initramfs...
[ 1.662831] Initramfs unpacking failed: junk in compressed archive
This patch prevents the above situation by requiring a larger space when looking
for a random kernel base, so that existing logic can effectively avoids the
overlap.
[kees: switched to perl to avoid hex translation pain in mawk vs gawk]
[kees: calculated overlap without relocs table]
Fixes: 82fa9637a2 ("x86, kaslr: Select random position from e820 maps")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Junjie Mao <eternal.n08@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1414762838-13067-1-git-send-email-eternal.n08@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
105 lines
2.8 KiB
C
105 lines
2.8 KiB
C
/* ----------------------------------------------------------------------- *
|
|
*
|
|
* Copyright (C) 2009 Intel Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301, USA.
|
|
*
|
|
* H. Peter Anvin <hpa@linux.intel.com>
|
|
*
|
|
* ----------------------------------------------------------------------- */
|
|
|
|
/*
|
|
* Compute the desired load offset from a compressed program; outputs
|
|
* a small assembly wrapper with the appropriate symbols defined.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <inttypes.h>
|
|
#include <tools/le_byteshift.h>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
uint32_t olen;
|
|
long ilen;
|
|
unsigned long offs;
|
|
unsigned long run_size;
|
|
FILE *f = NULL;
|
|
int retval = 1;
|
|
|
|
if (argc < 3) {
|
|
fprintf(stderr, "Usage: %s compressed_file run_size\n",
|
|
argv[0]);
|
|
goto bail;
|
|
}
|
|
|
|
/* Get the information for the compressed kernel image first */
|
|
|
|
f = fopen(argv[1], "r");
|
|
if (!f) {
|
|
perror(argv[1]);
|
|
goto bail;
|
|
}
|
|
|
|
|
|
if (fseek(f, -4L, SEEK_END)) {
|
|
perror(argv[1]);
|
|
}
|
|
|
|
if (fread(&olen, sizeof(olen), 1, f) != 1) {
|
|
perror(argv[1]);
|
|
goto bail;
|
|
}
|
|
|
|
ilen = ftell(f);
|
|
olen = get_unaligned_le32(&olen);
|
|
|
|
/*
|
|
* Now we have the input (compressed) and output (uncompressed)
|
|
* sizes, compute the necessary decompression offset...
|
|
*/
|
|
|
|
offs = (olen > ilen) ? olen - ilen : 0;
|
|
offs += olen >> 12; /* Add 8 bytes for each 32K block */
|
|
offs += 64*1024 + 128; /* Add 64K + 128 bytes slack */
|
|
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
|
|
run_size = atoi(argv[2]);
|
|
|
|
printf(".section \".rodata..compressed\",\"a\",@progbits\n");
|
|
printf(".globl z_input_len\n");
|
|
printf("z_input_len = %lu\n", ilen);
|
|
printf(".globl z_output_len\n");
|
|
printf("z_output_len = %lu\n", (unsigned long)olen);
|
|
printf(".globl z_extract_offset\n");
|
|
printf("z_extract_offset = 0x%lx\n", offs);
|
|
/* z_extract_offset_negative allows simplification of head_32.S */
|
|
printf(".globl z_extract_offset_negative\n");
|
|
printf("z_extract_offset_negative = -0x%lx\n", offs);
|
|
printf(".globl z_run_size\n");
|
|
printf("z_run_size = %lu\n", run_size);
|
|
|
|
printf(".globl input_data, input_data_end\n");
|
|
printf("input_data:\n");
|
|
printf(".incbin \"%s\"\n", argv[1]);
|
|
printf("input_data_end:\n");
|
|
|
|
retval = 0;
|
|
bail:
|
|
if (f)
|
|
fclose(f);
|
|
return retval;
|
|
}
|