From: Philipp Rudo <prudo@linux.ibm.com>
Date: Mon, 1 Apr 2019 10:13:42 +0000 (+0200)
Subject: s390/kexec_file: Fix potential segment overlap in ELF loader
X-Git-Tag: v5.2-rc1~186^2~46
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6339a3889ad4d0dd930ed7a1e873fb81d3e690f7;p=uclinux-h8%2Flinux.git

s390/kexec_file: Fix potential segment overlap in ELF loader

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: 8be018827154 ("s390/kexec_file: Add ELF loader")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/kexec_elf.c b/arch/s390/kernel/kexec_elf.c
index 5a286b012043..1d1c77c647d2 100644
--- a/arch/s390/kernel/kexec_elf.c
+++ b/arch/s390/kernel/kexec_elf.c
@@ -53,7 +53,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;