From: Sasha Levin <sashal@kernel.org>
Date: Wed, 26 Jun 2019 03:39:23 +0000 (-0400)
Subject: fixes for 5.1
X-Git-Tag: v4.4.184~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8acc40bc51cbdeb53d5a13d52c3ce64e48e75faf;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 5.1

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-5.1/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch b/queue-5.1/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
new file mode 100644
index 00000000000..a0a3574a0b8
--- /dev/null
+++ b/queue-5.1/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
@@ -0,0 +1,45 @@
+From c2b81fef082a1f72720aa0f0d213572f51708abe Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 25 Jun 2019 07:36:40 -0400
+Subject: Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP"
+
+This reverts commit b65b70ba068b7cdbfeb65eee87cce84a74618603, which was
+upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9.
+
+On Tue, Jun 25, 2019 at 09:39:45AM +0200, Sebastian Andrzej Siewior wrote:
+>Please backport commit e74deb11931ff682b59d5b9d387f7115f689698e to
+>stable _or_ revert the backport of commit 4a6c91fbdef84 ("x86/uaccess,
+>ftrace: Fix ftrace_likely_update() vs. SMAP"). It uses
+>user_access_{save|restore}() which has been introduced in the following
+>commit.
+
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ kernel/trace/trace_branch.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
+index 3ea65cdff30d..4ad967453b6f 100644
+--- a/kernel/trace/trace_branch.c
++++ b/kernel/trace/trace_branch.c
+@@ -205,8 +205,6 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect)
+ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
+ 			  int expect, int is_constant)
+ {
+-	unsigned long flags = user_access_save();
+-
+ 	/* A constant is always correct */
+ 	if (is_constant) {
+ 		f->constant++;
+@@ -225,8 +223,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
+ 		f->data.correct++;
+ 	else
+ 		f->data.incorrect++;
+-
+-	user_access_restore(flags);
+ }
+ EXPORT_SYMBOL(ftrace_likely_update);
+ 
+-- 
+2.20.1
+
diff --git a/queue-5.1/series b/queue-5.1/series
index 09a48bd90ef..4d22dced119 100644
--- a/queue-5.1/series
+++ b/queue-5.1/series
@@ -1 +1,2 @@
 arm64-don-t-unconditionally-add-wno-psabi-to-kbuild_cflags.patch
+revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch