From 5b6f8e8e3d05a563348734b2871d453e56f641c1 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 29 Oct 2020 13:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201029133007621084 - https://github.com/crash-utility/crash/commit/915cc069ec0338b2e5342fbd02cbfb921d5494af --- ...c069ec0338b2e5342fbd02cbfb921d5494af.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 915cc069ec0338b2e5342fbd02cbfb921d5494af.patch diff --git a/915cc069ec0338b2e5342fbd02cbfb921d5494af.patch b/915cc069ec0338b2e5342fbd02cbfb921d5494af.patch new file mode 100644 index 0000000..4b91c49 --- /dev/null +++ b/915cc069ec0338b2e5342fbd02cbfb921d5494af.patch @@ -0,0 +1,29 @@ +diff --git a/x86_64.c b/x86_64.c +index fc05e8a..0acef2b 100644 +--- a/x86_64.c ++++ b/x86_64.c +@@ -4412,15 +4412,20 @@ x86_64_exception_frame(ulong flags, ulong kvaddr, char *local, + long r8, r9, r10, r11, r12, r13, r14, r15; + struct machine_specific *ms; + struct syment *sp; +- ulong offset; ++ ulong offset, verify_addr; + char *pt_regs_buf; + long verified; + long err; + char buf[BUFSIZE]; + +- if (flags == EFRAME_VERIFY) { +- if (!accessible(kvaddr) || +- !accessible(kvaddr + SIZE(pt_regs) - sizeof(long))) ++ if (flags & EFRAME_VERIFY) { ++ if (kvaddr) ++ verify_addr = kvaddr; ++ else ++ verify_addr = (local - bt->stackbuf) + bt->stackbase; ++ ++ if (!accessible(verify_addr) || ++ !accessible(verify_addr + SIZE(pt_regs) - sizeof(long))) + return FALSE; + } + -- Gitee From 2454b0b1c20428451043f7e4d39299742bdf4d87 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Thu, 29 Oct 2020 13:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201029133007621084 - update spec file --- crash.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crash.spec b/crash.spec index 56316c6..b2482db 100644 --- a/crash.spec +++ b/crash.spec @@ -1,6 +1,6 @@ Name: crash Version: 7.2.8 -Release: 3 +Release: 4 Summary: Linux kernel crash utility. License: GPLv3 URL: http://people.redhat.com/anderson @@ -11,6 +11,7 @@ Patch1: use_system_readline_v3.patch Patch9000: add-SDEI-stack-resolution.patch Patch9001: fix-bitmap_len-calculation-overflow-problem-in-large.patch +Patch9002: 915cc069ec0338b2e5342fbd02cbfb921d5494af.patch BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel BuildRequires: gcc gcc-c++ bison readline-devel @@ -75,6 +76,9 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h %{_mandir}/man8/crash.8* %changelog +* 20201029133007621084 patch-tracking 7.2.8-4 +- append patch file of upstream repository from <915cc069ec0338b2e5342fbd02cbfb921d5494af> to <915cc069ec0338b2e5342fbd02cbfb921d5494af> + * Tue Sep 8 2020 shixuantong - 7.2.8-3 - Restore Source0 and URL @@ -91,4 +95,4 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h - Package rebuild. * Fri Aug 30 2019 openEuler Buildteam - 7.2.6-1 -- Package init. +- Package init. \ No newline at end of file -- Gitee