github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

s390/kexec_file: Fix potential segment overlap in ELF loader

Browse Source 
[ Upstream commit 6339a3889a ]

When loading an ELF image via kexec_file the segment alignment is ignored
in the calculation for the load address of the next segment. When there are
multiple segments this can lead to segment overlap and thus load failure.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Fixes: 8be0188271 ("s390/kexec_file: Add ELF loader")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Philipp Rudo 2019-04-01 12:13:42 +02:00 committed by Greg Kroah-Hartman
parent 0701a1d6f1
commit 232e674ed9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/kexec_elf.c
View File

@ -58,7 +58,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
if (ret)
return ret;
data->memsz += buf.memsz;
data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz;
}
return 0;