]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
pstore: Fix typo in compression option name
authorJiri Bohac <jbohac@suse.cz>
Thu, 18 Feb 2021 11:15:47 +0000 (12:15 +0100)
committerAndrea Righi <andrea.righi@canonical.com>
Mon, 15 Mar 2021 14:09:44 +0000 (15:09 +0100)
commit 19d8e9149c27b689c6224f5c84b96a159342195a upstream.

Both pstore_compress() and decompress_record() use a mistyped config
option name ("PSTORE_COMPRESSION" instead of "PSTORE_COMPRESS"). As
a result compression and decompression of pstore records was always
disabled.

Use the correct config option name.

Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Fixes: fd49e03280e5 ("pstore: Fix linking when crypto API disabled")
Acked-by: Matteo Croce <mcroce@microsoft.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210218111547.johvp5klpv3xrpnn@dwarf.suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
fs/pstore/platform.c

index 32f64abc277c3f61f29929904e768124dd16e9a8..d963ae7902f92fb5252f498f589c079ae65b0253 100644 (file)
@@ -269,7 +269,7 @@ static int pstore_compress(const void *in, void *out,
 {
        int ret;
 
-       if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION))
+       if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS))
                return -EINVAL;
 
        ret = crypto_comp_compress(tfm, in, inlen, out, &outlen);
@@ -671,7 +671,7 @@ static void decompress_record(struct pstore_record *record)
        int unzipped_len;
        char *unzipped, *workspace;
 
-       if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed)
+       if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !record->compressed)
                return;
 
        /* Only PSTORE_TYPE_DMESG support compression. */