080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From ed15ba1b9977e506637ff1697821d97127b2c919 Mon Sep 17 00:00:00 2001
|
|
From: Pratyush Anand <panand@redhat.com>
|
|
Date: Wed, 1 Mar 2017 11:19:42 +0530
|
|
Subject: [PATCH 21/45] build_mem_phdrs(): check if p_paddr is invalid
|
|
|
|
Currently, all the p_paddr of PT_LOAD headers are assigned to 0, which
|
|
is not correct and could be misleading, since 0 is a valid physical
|
|
address.
|
|
|
|
Upstream kernel commit "464920104bf7 /proc/kcore: update physical
|
|
address for kcore ram and text" fixed it and now invalid PT_LOAD is
|
|
assigned as -1.
|
|
|
|
kexec/arch/i386/crashdump-x86.c:get_kernel_vaddr_and_size() uses kcore
|
|
interface and so calls build_mem_phdrs() for kcore PT_LOAD headers.
|
|
|
|
This patch fixes build_mem_phdrs() to check if p_paddr is invalid.
|
|
|
|
Signed-off-by: Pratyush Anand <panand@redhat.com>
|
|
Acked-by: Dave Young <dyoung@redhat.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/kexec-elf.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kexec/kexec-elf.c b/kexec/kexec-elf.c
|
|
index 1d6320a2f0e6..be60bbd48486 100644
|
|
--- a/kexec/kexec-elf.c
|
|
+++ b/kexec/kexec-elf.c
|
|
@@ -432,7 +432,8 @@ static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr,
|
|
}
|
|
return -1;
|
|
}
|
|
- if ((phdr->p_paddr + phdr->p_memsz) < phdr->p_paddr) {
|
|
+ if (phdr->p_paddr != (unsigned long long)-1 &&
|
|
+ (phdr->p_paddr + phdr->p_memsz) < phdr->p_paddr) {
|
|
/* The memory address wraps */
|
|
if (probe_debug) {
|
|
fprintf(stderr, "ELF address wrap around\n");
|
|
--
|
|
2.13.0
|
|
|