diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-17 22:59:07 +0100 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-18 02:59:48 +0100 |
commit | 88ba41453dbc65e1d5d596073d66bdf2e59a43a1 (patch) | |
tree | 85b3d54e44612581df2482905a93ab53cae2acce /target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch | |
parent | 6c2e1ff80f52b939405fe0c14577c584602ae432 (diff) | |
download | upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.gz upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.bz2 upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.zip |
kernel: bump 4.14 to 4.14.20
Refresh patches.
Remove upstreamed patches:
- backport/080-v4.15-0001-arch-define-weak-abort.patch
- backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
Update patch that no longer applies:
pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
Fixes CVE-2017-8824.
Compile-tested: octeon, x86/64.
Runtime-tested: octeon, x86/64.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch b/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch deleted file mode 100644 index 1867234540..0000000000 --- a/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7c2c11b208be09c156573fc0076b7b3646e05219 Mon Sep 17 00:00:00 2001 -From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> -Date: Thu, 14 Dec 2017 15:33:19 -0800 -Subject: [PATCH] arch: define weak abort() - -gcc toggle -fisolate-erroneous-paths-dereference (default at -O2 -onwards) isolates faulty code paths such as null pointer access, divide -by zero etc. If gcc port doesnt implement __builtin_trap, an abort() is -generated which causes kernel link error. - -In this case, gcc is generating abort due to 'divide by zero' in -lib/mpi/mpih-div.c. - -Currently 'frv' and 'arc' are failing. Previously other arch was also -broken like m32r was fixed by commit d22e3d69ee1a ("m32r: fix build -failure"). - -Let's define this weak function which is common for all arch and fix the -problem permanently. We can even remove the arch specific 'abort' after -this is done. - -Link: http://lkml.kernel.org/r/1513118956-8718-1-git-send-email-sudipm.mukherjee@gmail.com -Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> -Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com> -Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com> -Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - kernel/exit.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/kernel/exit.c -+++ b/kernel/exit.c -@@ -1755,3 +1755,11 @@ Efault: - return -EFAULT; - } - #endif -+ -+__weak void abort(void) -+{ -+ BUG(); -+ -+ /* if that doesn't kill us, halt */ -+ panic("Oops failed to kill thread"); -+} |