diff --git a/SOURCES/sadump_read_excluded_pages.patch b/SOURCES/sadump_read_excluded_pages.patch new file mode 100644 index 0000000..7d4f2b4 --- /dev/null +++ b/SOURCES/sadump_read_excluded_pages.patch @@ -0,0 +1,30 @@ +--- crash-7.1.0/sadump.c.orig ++++ crash-7.1.0/sadump.c +@@ -394,7 +394,13 @@ restart: + } + + sd->filename = file; +- sd->flags = flags; ++ ++ /* ++ * Switch to zero excluded mode by default on sadump-related ++ * formats because some Fujitsu troubleshooting software ++ * assumes the behavior. ++ */ ++ sd->flags = flags | SADUMP_ZERO_EXCLUDED; + + if (machine_type("X86")) + sd->machine_type = EM_386; +--- crash-7.1.0/tools.c.orig ++++ crash-7.1.0/tools.c +@@ -2479,7 +2479,9 @@ show_options(void) + fprintf(fp, " namelist: %s\n", pc->namelist); + fprintf(fp, " dumpfile: %s\n", pc->dumpfile); + fprintf(fp, " unwind: %s\n", kt->flags & DWARF_UNWIND ? "on" : "off"); +- fprintf(fp, " zero_excluded: %s\n", *diskdump_flags & ZERO_EXCLUDED ? "on" : "off"); ++ fprintf(fp, " zero_excluded: %s\n", ++ (*diskdump_flags & ZERO_EXCLUDED) || sadump_is_zero_excluded() ? ++ "on" : "off"); + fprintf(fp, " null-stop: %s\n", *gdb_stop_print_at_null ? "on" : "off"); + fprintf(fp, " gdb: %s\n", pc->flags2 & GDB_CMD_MODE ? "on" : "off"); + fprintf(fp, " scope: %lx ", pc->scope); diff --git a/SPECS/crash.spec b/SPECS/crash.spec index a513294..b16eec1 100644 --- a/SPECS/crash.spec +++ b/SPECS/crash.spec @@ -4,7 +4,7 @@ Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles Name: crash Version: 7.1.2 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: GPLv3 Group: Development/Debuggers Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz @@ -18,6 +18,7 @@ Patch0: lzo_snappy.patch Patch1: recognize_multiple_page_slab_cache.patch Patch2: fix_ARM64_bt-f_SIGSEGV.patch Patch3: fix_sadump_read_failures.patch +Patch4: sadump_read_excluded_pages.patch %description The core analysis suite is a self-contained tool that can be used to @@ -42,6 +43,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch. %patch1 -p1 -b recognize_multiple_page_slab_cache.patch %patch2 -p1 -b fix_ARM64_bt-f_SIGSEGV.patch %patch3 -p1 -b fix_sadump_read_failures.patch +%patch4 -p1 -b sadump_read_excluded_pages.patch %build make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" @@ -70,6 +72,10 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Tue Apr 5 2017 Dave Anderson - 7.1.2-3.el7_2.1 +- crash: fails to read excluded pages by default on sadump-related formats + Resolves: rhbz#1324115 + * Mon Nov 23 2015 Dave Anderson - 7.1.2-3 - crash fails to read or wrongly reads some parts of memory in sadump vmcore format Resolves: rhbz#1282997