]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Mar 2020 14:51:03 +0000 (15:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Mar 2020 14:51:03 +0000 (15:51 +0100)
added patches:
revert-char-random-silence-a-lockdep-splat-with-printk.patch

queue-4.14/revert-char-random-silence-a-lockdep-splat-with-printk.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/revert-char-random-silence-a-lockdep-splat-with-printk.patch b/queue-4.14/revert-char-random-silence-a-lockdep-splat-with-printk.patch
new file mode 100644 (file)
index 0000000..48d94fc
--- /dev/null
@@ -0,0 +1,35 @@
+From 89d8f530ab55a8eabec056e88769ef9f8f2ceb92 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 5 Mar 2020 15:48:03 +0100
+Subject: [PATCH] Revert "char/random: silence a lockdep splat with printk()"
+
+This reverts commit 28820c5802f9f83c655ab09ccae8289103ce1490 which is
+commit 1b710b1b10eff9d46666064ea25f079f70bc67a8 upstream.
+
+It causes problems here just like it did in 4.19.y and odds are it will
+be reverted upstream as well.
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
+Cc: Qian Cai <cai@lca.pw>
+Cc: Theodore Ts'o <tytso@mit.edu>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/random.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -1598,9 +1598,8 @@ static void _warn_unseeded_randomness(co
+       print_once = true;
+ #endif
+       if (__ratelimit(&unseeded_warning))
+-              printk_deferred(KERN_NOTICE "random: %s called from %pS "
+-                              "with crng_init=%d\n", func_name, caller,
+-                              crng_init);
++              pr_notice("random: %s called from %pS with crng_init=%d\n",
++                        func_name, caller, crng_init);
+ }
+ /*
index 29278d31917ed0f0ca655def304ff28c5315af10..8d876c60727c68e5adf417750992d5450ed7f25d 100644 (file)
@@ -63,4 +63,5 @@ kprobes-set-unoptimized-flag-after-unoptimizing-code.patch
 perf-hists-browser-restore-esc-as-zoom-out-of-dso-thread-etc.patch
 mm-huge_memory.c-use-head-to-check-huge-zero-page.patch
 mm-thp-fix-defrag-setting-if-newline-is-not-used.patch
+revert-char-random-silence-a-lockdep-splat-with-printk.patch
 audit-always-check-the-netlink-payload-length-in-aud.patch