Commit 729829d7 authored by Philipp Rudo's avatar Philipp Rudo Committed by Martin Schwidefsky

s390/kexec_file: Fix detection of text segment in ELF loader

To register data for the next kernel (command line, oldmem_base, etc.) the
current kernel needs to find the ELF segment that contains head.S. This is
currently done by checking ifor 'phdr->p_paddr == 0'. This works fine for
the current kernel build but in theory the first few pages could be
skipped. Make the detection more robust by checking if the entry point lies
within the segment.
Signed-off-by: default avatarPhilipp Rudo <prudo@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6339a388
...@@ -19,10 +19,15 @@ static int kexec_file_add_elf_kernel(struct kimage *image, ...@@ -19,10 +19,15 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
struct kexec_buf buf; struct kexec_buf buf;
const Elf_Ehdr *ehdr; const Elf_Ehdr *ehdr;
const Elf_Phdr *phdr; const Elf_Phdr *phdr;
Elf_Addr entry;
int i, ret; int i, ret;
ehdr = (Elf_Ehdr *)kernel; ehdr = (Elf_Ehdr *)kernel;
buf.image = image; buf.image = image;
if (image->type == KEXEC_TYPE_CRASH)
entry = STARTUP_KDUMP_OFFSET;
else
entry = ehdr->e_entry;
phdr = (void *)ehdr + ehdr->e_phoff; phdr = (void *)ehdr + ehdr->e_phoff;
for (i = 0; i < ehdr->e_phnum; i++, phdr++) { for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
...@@ -35,7 +40,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image, ...@@ -35,7 +40,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
buf.mem = ALIGN(phdr->p_paddr, phdr->p_align); buf.mem = ALIGN(phdr->p_paddr, phdr->p_align);
buf.memsz = phdr->p_memsz; buf.memsz = phdr->p_memsz;
if (phdr->p_paddr == 0) { if (entry - phdr->p_paddr < phdr->p_memsz) {
data->kernel_buf = buf.buffer; data->kernel_buf = buf.buffer;
data->memsz += STARTUP_NORMAL_OFFSET; data->memsz += STARTUP_NORMAL_OFFSET;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment