aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-14 13:14:57 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-14 17:18:54 +0200
commit7dd822983b8728772e433c7718739b741c3d6de0 (patch)
treed26ea01078299c967e01d2284dde24eb7e44a3bf /target/linux/uml
parentaee081e62ef8b79f7ea18eac3e66eddcfd03e00a (diff)
downloadupstream-7dd822983b8728772e433c7718739b741c3d6de0.tar.gz
upstream-7dd822983b8728772e433c7718739b741c3d6de0.tar.bz2
upstream-7dd822983b8728772e433c7718739b741c3d6de0.zip
kernel: bump 4.14 to 4.14.201
Refreshed all patches. Fixes: - CVE-2020-14386 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/patches-4.14/101-mconsole-exec.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/uml/patches-4.14/101-mconsole-exec.patch b/target/linux/uml/patches-4.14/101-mconsole-exec.patch
index 2acb519323..c775ccc691 100644
--- a/target/linux/uml/patches-4.14/101-mconsole-exec.patch
+++ b/target/linux/uml/patches-4.14/101-mconsole-exec.patch
@@ -153,7 +153,7 @@
int (*init)(struct subprocess_info *info, struct cred *new);
--- a/kernel/umh.c
+++ b/kernel/umh.c
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
#include <linux/ptrace.h>
#include <linux/async.h>
#include <linux/uaccess.h>
@@ -161,7 +161,7 @@
#include <trace/events/module.h>
-@@ -70,6 +71,28 @@ static int call_usermodehelper_exec_asyn
+@@ -71,6 +72,28 @@ static int call_usermodehelper_exec_asyn
flush_signal_handlers(current, 1);
spin_unlock_irq(&current->sighand->siglock);
@@ -188,9 +188,9 @@
+ }
+
/*
- * Our parent (unbound workqueue) runs with elevated scheduling
- * priority. Avoid propagating that into the userspace child.
-@@ -393,6 +416,20 @@ struct subprocess_info *call_usermodehel
+ * Initial kernel threads share ther FS with init, in order to
+ * get the init root directory. But we've now created a new
+@@ -402,6 +425,20 @@ struct subprocess_info *call_usermodehel
}
EXPORT_SYMBOL(call_usermodehelper_setup);