[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190520115254.135611751@linuxfoundation.org>
Date: Mon, 20 May 2019 14:14:46 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org,
Sai Prakash Ranjan <saiprakash.ranjan@...eaurora.org>,
"Joel Fernandes (Google)" <joel@...lfernandes.org>,
Kees Cook <keescook@...omium.org>,
Guenter Roeck <groeck@...omium.org>
Subject: [PATCH 4.19 100/105] pstore: Allocate compression during late_initcall()
From: Joel Fernandes (Google) <joel@...lfernandes.org>
commit 416031653eb55f844e3547fb8f8576399a800da0 upstream.
ramoops's call of pstore_register() was recently moved to run during
late_initcall() because the crypto backend may not have been ready during
postcore_initcall(). This meant early-boot crash dumps were not getting
caught by pstore any more.
Instead, lets allow calls to pstore_register() earlier, and once crypto
is ready we can initialize the compression.
Reported-by: Sai Prakash Ranjan <saiprakash.ranjan@...eaurora.org>
Signed-off-by: Joel Fernandes (Google) <joel@...lfernandes.org>
Tested-by: Sai Prakash Ranjan <saiprakash.ranjan@...eaurora.org>
Fixes: cb3bee0369bc ("pstore: Use crypto compress API")
[kees: trivial rebase]
Signed-off-by: Kees Cook <keescook@...omium.org>
Tested-by: Guenter Roeck <groeck@...omium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
fs/pstore/platform.c | 10 +++++++++-
fs/pstore/ram.c | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -786,13 +786,21 @@ static int __init pstore_init(void)
pstore_choose_compression();
+ /*
+ * Check if any pstore backends registered earlier but did not
+ * initialize compression because crypto was not ready. If so,
+ * initialize compression now.
+ */
+ if (psinfo && !tfm)
+ allocate_buf_for_compression();
+
ret = pstore_init_fs();
if (ret)
return ret;
return 0;
}
-module_init(pstore_init)
+late_initcall(pstore_init);
static void __exit pstore_exit(void)
{
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -956,7 +956,7 @@ static int __init ramoops_init(void)
return ret;
}
-late_initcall(ramoops_init);
+postcore_initcall(ramoops_init);
static void __exit ramoops_exit(void)
{
Powered by blists - more mailing lists