Skip to contentSkip to conversation

Patch "pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Jul 22, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pstore-don-t-warn-if-data-is-uncompressed-and-type-is-not-pstore_type_dmesg.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4a16d1cb245c56e72fd40a28f3cdb394cde4b341 Mon Sep 17 00:00:00 2001

From: Ankit Kumar <[email protected]>
Date: Tue, 23 May 2017 11:16:52 +0530
Subject: pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG

From: Ankit Kumar <[email protected]>

commit 4a16d1cb245c56e72fd40a28f3cdb394cde4b341 upstream.

commit 9abdcccc3d5f ("pstore: Extract common arguments into structure") moved record decompression to function. decompress_record() gets called without checking type and compressed flag. Warning will be reported if data is uncompressed. Pstore type PSTORE_TYPE_PPC_OPAL, PSTORE_TYPE_PPC_COMMON doesn't contain compressed data and warning get printed part of dmesg.

Partial dmesg log:

[   35.848914] pstore: ignored compressed record type 6
[   35.848927] pstore: ignored compressed record type 8

Above warning should not get printed as it is known that data won't be compressed for above type and it is valid condition.

This patch returns if data is not compressed and print warning only if data is compressed and type is not PSTORE_TYPE_DMESG.

Fixes 9abdcccc3d5f ("pstore: Extract common arguments into structure")
---
 fs/pstore/platform.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/pstore/platform.c +4 -1
@@ -770,8 +770,11 @@ static void decompress_record(struct pst
 	int unzipped_len;
 	char *decompressed;
 
+	if (!record->compressed)
+		return;
+
 	/* Only PSTORE_TYPE_DMESG support compression. */
-	if (!record->compressed || record->type != PSTORE_TYPE_DMESG) {
+	if (record->type != PSTORE_TYPE_DMESG) {
 		pr_warn("ignored compressed record type %d\n", record->type);
 		return;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/pstore-don-t-warn-if-data-is-uncompressed-and-type-is-not-pstore_type_dmesg.patch