diff --git a/kexec-tools-2.0.23-makedumpfile-Avoid_false_positive_mem_section_validation_with_vmlinux.patch b/kexec-tools-2.0.23-makedumpfile-Avoid_false_positive_mem_section_validation_with_vmlinux.patch
deleted file mode 100644
index 8a7dd8a..0000000
--- a/kexec-tools-2.0.23-makedumpfile-Avoid_false_positive_mem_section_validation_with_vmlinux.patch
+++ /dev/null
@@ -1,76 +0,0 @@
- commit 6d0d95ecc04a70f8448d562ff0fbbae237f5c929
- Author: Kazuhito Hagio <k-hagio-ab@nec.com>
- Date: Thu Apr 21 08:58:29 2022 +0900
-
- [PATCH] Avoid false-positive mem_section validation with vmlinux
-
- Currently get_mem_section() validates if SYMBOL(mem_section) is the address
- of the mem_section array first. But there was a report that the first
- validation wrongly returned TRUE with -x vmlinux and SPARSEMEM_EXTREME
- (4.15+) on s390x. This leads to crash failing statup with the following
- seek error:
-
- crash: seek error: kernel virtual address: 67fffc2800 type: "memory section root table"
-
- Skip the first validation when satisfying the conditions.
-
- Reported-by: Dave Wysochanski <dwysocha@redhat.com>
- Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
- Reviewed-and-Tested-by: Philipp Rudo <prudo@redhat.com>
- Reviewed-by: Pingfan Liu <piliu@redhat.com>
-
- diff --git a/makedumpfile-1.7.1/makedumpfile.c b/makedumpfile-1.7.1/makedumpfile.c
- index a2f45c84cee3ba57ce3d3cf3f1905e6a03f4fd09..65d1c7c2f02c9ae8ead9de0f0217235fe72b3ca7 100644
- --- a/makedumpfile-1.7.1/makedumpfile.c
- +++ b/makedumpfile-1.7.1/makedumpfile.c
- @@ -3698,6 +3698,22 @@ validate_mem_section(unsigned long *mem_sec,
- return ret;
- }
-
- +/*
- + * SYMBOL(mem_section) varies with the combination of memory model and
- + * its source:
- + *
- + * SPARSEMEM
- + * vmcoreinfo: address of mem_section root array
- + * -x vmlinux: address of mem_section root array
- + *
- + * SPARSEMEM_EXTREME v1
- + * vmcoreinfo: address of mem_section root array
- + * -x vmlinux: address of mem_section root array
- + *
- + * SPARSEMEM_EXTREME v2 (with 83e3c48729d9 and a0b1280368d1) 4.15+
- + * vmcoreinfo: address of mem_section root array
- + * -x vmlinux: address of pointer to mem_section root array
- + */
- static int
- get_mem_section(unsigned int mem_section_size, unsigned long *mem_maps,
- unsigned int num_section)
- @@ -3710,12 +3726,27 @@ get_mem_section(unsigned int mem_section_size, unsigned long *mem_maps,
- strerror(errno));
- return FALSE;
- }
- +
- + /*
- + * There was a report that the first validation wrongly returned TRUE
- + * with -x vmlinux and SPARSEMEM_EXTREME v2 on s390x, so skip it.
- + * Howerver, leave the fallback validation as it is for the -i option.
- + */
- + if (is_sparsemem_extreme() && info->name_vmlinux) {
- + unsigned long flag = 0;
- + if (get_symbol_type_name("mem_section", DWARF_INFO_GET_SYMBOL_TYPE,
- + NULL, &flag)
- + && !(flag & TYPE_ARRAY))
- + goto skip_1st_validation;
- + }
- +
- ret = validate_mem_section(mem_sec, SYMBOL(mem_section),
- mem_section_size, mem_maps, num_section);
-
- if (!ret && is_sparsemem_extreme()) {
- unsigned long mem_section_ptr;
-
- +skip_1st_validation:
- if (!readmem(VADDR, SYMBOL(mem_section), &mem_section_ptr,
- sizeof(mem_section_ptr)))
- goto out;
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 8fdaf29..a7a642e 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
%global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554
%global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7})
-%global mkdf_ver 1.7.1
+%global mkdf_ver 1.7.2
%global mkdf_shortver %(c=%{mkdf_ver}; echo ${c:0:7})
Name: kexec-tools
@@ -111,7 +111,6 @@ Requires: systemd-udev%{?_isa}
#
# Patches 601 onward are generic patches
#
-Patch601: ./kexec-tools-2.0.23-makedumpfile-Avoid_false_positive_mem_section_validation_with_vmlinux.patch
%description
kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -127,8 +126,6 @@ mkdir -p -m755 kcp
tar -z -x -v -f %{SOURCE9}
tar -z -x -v -f %{SOURCE19}
-%patch601 -p1
-
%ifarch ppc
%define archdef ARCH=ppc
%endif
diff --git a/sources b/sources
index 3b73e05..20bacfe 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (eppic-e8844d3.tar.gz) = d86b9f90c57e694107272d8f71b87f66a30743b9530480fb6f665026bbada4c6b0205a83e40b5383663a945681cfbfcf1ee79469fc219ddf679473c4b2290763
-SHA512 (makedumpfile-1.7.1.tar.gz) = 93e36487b71f567d3685b151459806cf36017e52bf3ee68dd448382b279a422d1a8abef72e291ccb8206f2149ccd08ba484ec0027d1caab3fa1edbc3d28c3632
SHA512 (kexec-tools-2.0.25.tar.xz) = 6fd3fe11d428c5bb2ce318744146e03ddf752cc77632064bdd7418ef3ad355ad2e2db212d68a5bc73554d78f786901beb42d72bd62e2a4dae34fb224b667ec6b
+SHA512 (makedumpfile-1.7.2.tar.gz) = 324e303dd5f507703f66e2bd5dc9d24f9f50ba797be70c05702008ba77078f61ffcc884796ddf9ab737de1d124c3a9d881ab5ce4f3f459690ec00055af25ea9e