diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-09 12:43:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-09 12:43:18 -0700 |
| commit | 190f2ace0efdf632f0451a9543f00f50148837bf (patch) | |
| tree | 5db6e04e4d8b8802d397cc334f7d5e798e01ada0 /fs | |
| parent | selinux: fix missing dput() before selinuxfs unmount (diff) | |
| parent | pstore: fix crypto dependencies without compression (diff) | |
| download | linux-dev-190f2ace0efdf632f0451a9543f00f50148837bf.tar.xz linux-dev-190f2ace0efdf632f0451a9543f00f50148837bf.zip | |
Merge tag 'pstore-v4.17-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fix from Kees Cook:
"Fix another compression Kconfig combination missed in testing (Tobias
Regnery)"
* tag 'pstore-v4.17-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: fix crypto dependencies without compression
Diffstat (limited to 'fs')
| -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, static void allocate_buf_for_compression(void) { - if (!zbackend) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !zbackend) return; if (!crypto_has_comp(zbackend->name, 0, 0)) { @@ -287,7 +287,7 @@ static void allocate_buf_for_compression(void) static void free_buf_for_compression(void) { - if (!IS_ERR_OR_NULL(tfm)) + if (IS_ENABLED(CONFIG_PSTORE_COMPRESS) && !IS_ERR_OR_NULL(tfm)) crypto_free_comp(tfm); kfree(big_oops_buf); big_oops_buf = NULL; |