mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-24 02:52:55 +00:00
upd: 5.4.40 -> 5.4.58 (Fixed CVE-2020-0543)
This commit is contained in:
parent
48548b3dfd
commit
713ed8654b
3 changed files with 3 additions and 66 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,6 +1,6 @@
|
||||||
sources:
|
sources:
|
||||||
linux-5.4.tar.xz: 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd
|
linux-5.4.tar.xz: 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd
|
||||||
patch-5.4.40.xz: 139df451b1071f3d05ebff1b74a468165d76b20a
|
patch-5.4.58.xz: c407c83f1681320c1a62d04433e3b8587e2117f5
|
||||||
public_key_GOST_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774
|
public_key_GOST_1.pem: b4fb6bf1cf73824944931a8f0c2cb7bf427e0774
|
||||||
public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12
|
public_key_GOST_2.pem: cba209bd331f29031c5d945949b230a8d7a4dc12
|
||||||
public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb
|
public_key_GOST_3.pem: e5a223dd7c556d4d0cac326f5ed9fc12dd769afb
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
%define kernelversion 5
|
%define kernelversion 5
|
||||||
%define patchlevel 4
|
%define patchlevel 4
|
||||||
# sublevel is used for stable-based kernels
|
# sublevel is used for stable-based kernels
|
||||||
%define sublevel 40
|
%define sublevel 58
|
||||||
|
|
||||||
# Release number. Increase this before a rebuild.
|
# Release number. Increase this before a rebuild.
|
||||||
%define rpmrel 11
|
%define rpmrel 1
|
||||||
%define fullrpmrel %{rpmrel}
|
%define fullrpmrel %{rpmrel}
|
||||||
|
|
||||||
%define rpmtag %{disttag}
|
%define rpmtag %{disttag}
|
||||||
|
@ -278,9 +278,6 @@ Patch202: 0002-Documentation-for-AltHa-LSM.patch
|
||||||
Patch301: objtool-sync-check.sh-set-the-exit-code-explicitly.patch
|
Patch301: objtool-sync-check.sh-set-the-exit-code-explicitly.patch
|
||||||
# sent to upstream, https://patchwork.kernel.org/patch/11446123/
|
# sent to upstream, https://patchwork.kernel.org/patch/11446123/
|
||||||
Patch302: 0001-sign-file-full-functionality-with-modern-LibreSSL.patch
|
Patch302: 0001-sign-file-full-functionality-with-modern-LibreSSL.patch
|
||||||
# For buildability with new binutils
|
|
||||||
# https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/commit/?id=0ada120c883d
|
|
||||||
Patch303: perf-5.4.20-binutil-libs-2.34.patch
|
|
||||||
# Add sysctl to disable disk-based swap
|
# Add sysctl to disable disk-based swap
|
||||||
Patch304: 0001-mm-add-sysctl-to-disable-disk-based-swap.patch
|
Patch304: 0001-mm-add-sysctl-to-disable-disk-based-swap.patch
|
||||||
# Support loading GOST-signed modules
|
# Support loading GOST-signed modules
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Changbin Du <changbin.du@gmail.com>
|
|
||||||
Date: Tue, 28 Jan 2020 23:29:38 +0800
|
|
||||||
Subject: perf: Make perf able to build with latest libbfd
|
|
||||||
|
|
||||||
libbfd has changed the bfd_section_* macros to inline functions
|
|
||||||
bfd_section_<field> since 2019-09-18. See below two commits:
|
|
||||||
o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
|
|
||||||
o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html
|
|
||||||
|
|
||||||
This fix make perf able to build with both old and new libbfd.
|
|
||||||
|
|
||||||
Signed-off-by: Changbin Du <changbin.du@gmail.com>
|
|
||||||
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
||||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
||||||
Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com
|
|
||||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
||||||
---
|
|
||||||
tools/perf/util/srcline.c | 16 +++++++++++++++-
|
|
||||||
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
|
|
||||||
index 6ccf6f6..5b7d6c1 100644
|
|
||||||
--- a/tools/perf/util/srcline.c
|
|
||||||
+++ b/tools/perf/util/srcline.c
|
|
||||||
@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
|
|
||||||
bfd_vma pc, vma;
|
|
||||||
bfd_size_type size;
|
|
||||||
struct a2l_data *a2l = data;
|
|
||||||
+ flagword flags;
|
|
||||||
|
|
||||||
if (a2l->found)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
|
|
||||||
+#ifdef bfd_get_section_flags
|
|
||||||
+ flags = bfd_get_section_flags(abfd, section);
|
|
||||||
+#else
|
|
||||||
+ flags = bfd_section_flags(section);
|
|
||||||
+#endif
|
|
||||||
+ if ((flags & SEC_ALLOC) == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
pc = a2l->addr;
|
|
||||||
+#ifdef bfd_get_section_vma
|
|
||||||
vma = bfd_get_section_vma(abfd, section);
|
|
||||||
+#else
|
|
||||||
+ vma = bfd_section_vma(section);
|
|
||||||
+#endif
|
|
||||||
+#ifdef bfd_get_section_size
|
|
||||||
size = bfd_get_section_size(section);
|
|
||||||
+#else
|
|
||||||
+ size = bfd_section_size(section);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (pc < vma || pc >= vma + size)
|
|
||||||
return;
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue