diff options
author | Tobias Regnery <tobias.regnery@gmail.com> | 2018-04-06 03:25:17 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2018-04-06 18:45:33 -0400 |
commit | e698aaf37f9fac419ac6c1867137cce83c90c80b (patch) | |
tree | 90b83e1acb2f454b6c44e734001c81979cd6002d | |
parent | 58eb5b6707477ff458db3ee522aac317da719e2a (diff) |
pstore: fix crypto dependencies without compression
Commit 58eb5b670747 ("pstore: fix crypto dependencies") fixed up the crypto
dependencies but missed the case when no compression is selected.
With CONFIG_PSTORE=y, CONFIG_PSTORE_COMPRESS=n and CONFIG_CRYPTO=m we see
the following link error:
fs/pstore/platform.o: In function `pstore_register':
(.text+0x1b1): undefined reference to `crypto_has_alg'
(.text+0x205): undefined reference to `crypto_alloc_base'
fs/pstore/platform.o: In function `pstore_unregister':
(.text+0x3b0): undefined reference to `crypto_destroy_tfm'
Fix this by checking at compile-time if CONFIG_PSTORE_COMPRESS is enabled.
Fixes: 58eb5b670747 ("pstore: fix crypto dependencies")
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r-- | fs/pstore/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 1143ef351c58..dc720573fd53 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c | |||
@@ -258,7 +258,7 @@ static int pstore_decompress(void *in, void *out, | |||
258 | 258 | ||
259 | static void allocate_buf_for_compression(void) | 259 | static void allocate_buf_for_compression(void) |
260 | { | 260 | { |
261 | if (!zbackend) | 261 | if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !zbackend) |
262 | return; | 262 | return; |
263 | 263 | ||
264 | if (!crypto_has_comp(zbackend->name, 0, 0)) { | 264 | if (!crypto_has_comp(zbackend->name, 0, 0)) { |
@@ -287,7 +287,7 @@ static void allocate_buf_for_compression(void) | |||
287 | 287 | ||
288 | static void free_buf_for_compression(void) | 288 | static void free_buf_for_compression(void) |
289 | { | 289 | { |
290 | if (!IS_ERR_OR_NULL(tfm)) | 290 | if (IS_ENABLED(CONFIG_PSTORE_COMPRESS) && !IS_ERR_OR_NULL(tfm)) |
291 | crypto_free_comp(tfm); | 291 | crypto_free_comp(tfm); |
292 | kfree(big_oops_buf); | 292 | kfree(big_oops_buf); |
293 | big_oops_buf = NULL; | 293 | big_oops_buf = NULL; |