diff options
| author | Ankit Kumar <[email protected]> | 2017-05-23 11:16:52 +0530 |
|---|---|---|
| committer | Kees Cook <[email protected]> | 2017-05-31 10:09:32 -0700 |
| commit | 4a16d1cb245c56e72fd40a28f3cdb394cde4b341 (patch) | |
| tree | 09e5d0559d3ac2ff4b9072a0b71603ec0cf3affb | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG
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.
Reported-by: Anton Blanchard <[email protected]>
Signed-off-by: Ankit Kumar <[email protected]>
Reviewed-by: Mahesh Salgaonkar <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Fixes: 9abdcccc3d5f ("pstore: Extract common arguments into structure")
Cc: [email protected]
| -rw-r--r-- | fs/pstore/platform.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index d468eec9b8a6..b3045530dd4e 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -770,8 +770,11 @@ static void decompress_record(struct pstore_record *record) 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; } |