From: Greg Kroah-Hartman Date: Thu, 5 Mar 2020 14:51:03 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.19.108~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=196d42be707371e54610ad119bc9bf3a490ef404;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: revert-char-random-silence-a-lockdep-splat-with-printk.patch --- 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 index 00000000000..48d94fcb50f --- /dev/null +++ b/queue-4.14/revert-char-random-silence-a-lockdep-splat-with-printk.patch @@ -0,0 +1,35 @@ +From 89d8f530ab55a8eabec056e88769ef9f8f2ceb92 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +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 +Cc: Sergey Senozhatsky +Cc: Qian Cai +Cc: Theodore Ts'o +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + 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); + } + + /* diff --git a/queue-4.14/series b/queue-4.14/series index 29278d31917..8d876c60727 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -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