Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 190f2ace authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fd40ffc7 e698aaf3

fs/pstore/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -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;