public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
* pstore: fix compression
@ 2021-02-18 11:15 Jiri Bohac
  2021-02-18 11:48 ` Matteo Croce
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Jiri Bohac @ 2021-02-18 11:15 UTC (permalink / raw)
  To: Kees Cook, Anton Vorontsov, Colin Cross, Tony Luck
  Cc: Matteo Croce, stable, linux-kernel

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

Use the correct config option name.

Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Fixes: fd49e03280e596e54edb93a91bc96170f8e97e4a ("pstore: Fix linking when crypto API disabled")

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 32f64abc277c..d963ae7902f9 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -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. */

-- 
Jiri Bohac <jbohac@suse.cz>
SUSE Labs, Prague, Czechia


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: pstore: fix compression
  2021-02-18 11:15 pstore: fix compression Jiri Bohac
@ 2021-02-18 11:48 ` Matteo Croce
  2021-02-18 12:12 ` Greg KH
  2021-02-18 20:30 ` Kees Cook
  2 siblings, 0 replies; 4+ messages in thread
From: Matteo Croce @ 2021-02-18 11:48 UTC (permalink / raw)
  To: Jiri Bohac
  Cc: Kees Cook, Anton Vorontsov, Colin Cross, Tony Luck, stable,
	linux-kernel

On Thu, Feb 18, 2021 at 12:15 PM Jiri Bohac <jbohac@suse.cz> wrote:
>
> pstore_compress() and decompress_record() use a mistyped config option
> name ("PSTORE_COMPRESSION" instead of "PSTORE_COMPRESS").
> As a result compression and decompressionm of pstore records is always
> disabled.
>
> Use the correct config option name.
>
> Signed-off-by: Jiri Bohac <jbohac@suse.cz>
> Fixes: fd49e03280e596e54edb93a91bc96170f8e97e4a ("pstore: Fix linking when crypto API disabled")
>

Acked-by: Matteo Croce <mcroce@microsoft.com>

-- 
per aspera ad upstream

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: pstore: fix compression
  2021-02-18 11:15 pstore: fix compression Jiri Bohac
  2021-02-18 11:48 ` Matteo Croce
@ 2021-02-18 12:12 ` Greg KH
  2021-02-18 20:30 ` Kees Cook
  2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-02-18 12:12 UTC (permalink / raw)
  To: Jiri Bohac
  Cc: Kees Cook, Anton Vorontsov, Colin Cross, Tony Luck, Matteo Croce,
	stable, linux-kernel

On Thu, Feb 18, 2021 at 12:15:47PM +0100, Jiri Bohac wrote:
> pstore_compress() and decompress_record() use a mistyped config option
> name ("PSTORE_COMPRESSION" instead of "PSTORE_COMPRESS").
> As a result compression and decompressionm of pstore records is always
> disabled.
> 
> Use the correct config option name.
> 
> Signed-off-by: Jiri Bohac <jbohac@suse.cz>
> Fixes: fd49e03280e596e54edb93a91bc96170f8e97e4a ("pstore: Fix linking when crypto API disabled")
> 
<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: pstore: fix compression
  2021-02-18 11:15 pstore: fix compression Jiri Bohac
  2021-02-18 11:48 ` Matteo Croce
  2021-02-18 12:12 ` Greg KH
@ 2021-02-18 20:30 ` Kees Cook
  2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2021-02-18 20:30 UTC (permalink / raw)
  To: Tony Luck, Anton Vorontsov, Jiri Bohac, Colin Cross
  Cc: Kees Cook, Matteo Croce, stable, linux-kernel

On Thu, 18 Feb 2021 12:15:47 +0100, Jiri Bohac wrote:
> pstore_compress() and decompress_record() use a mistyped config option
> name ("PSTORE_COMPRESSION" instead of "PSTORE_COMPRESS").
> As a result compression and decompressionm of pstore records is always
> disabled.
> 
> Use the correct config option name.

Eek; thanks for the catch!

Applied to for-next/pstore, thanks!

[1/1] pstore: Fix typo in compression option name
      https://git.kernel.org/kees/c/19d8e9149c27

-- 
Kees Cook


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-18 20:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-18 11:15 pstore: fix compression Jiri Bohac
2021-02-18 11:48 ` Matteo Croce
2021-02-18 12:12 ` Greg KH
2021-02-18 20:30 ` Kees Cook

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox