Merge tag 'pstore-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (19a93823) · Commits · 戴 / test

Pull pstore update from Kees Cook: "A tiny pstore update which fixes a very corner-case build failure: - Fix linking when crypto API disabled (Matteo Croce)" * tag 'pstore-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: Fix linking when crypto API disabled

fs/pstore/platform.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -269,6 +269,9 @@ static int pstore_compress(const void in, void out,
		{
		int ret;

		if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION))
		return -EINVAL;

		ret = crypto_comp_compress(tfm, in, inlen, out, &outlen);
		if (ret) {
		pr_err("crypto_comp_compress failed, ret = %d!\n", ret);
		@@ -668,7 +671,7 @@ static void decompress_record(struct pstore_record *record)
		int unzipped_len;
		char unzipped, workspace;

		if (!record->compressed)
		if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) \|\| !record->compressed)
		return;

		/* Only PSTORE_TYPE_DMESG support compression. */

Admin message