From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33002 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbdGVNgI (ORCPT ); Sat, 22 Jul 2017 09:36:08 -0400 Subject: 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 To: ankit@linux.vnet.ibm.com, anton@au1.ibm.com, gregkh@linuxfoundation.org, keescook@chromium.org, mahesh@linux.vnet.ibm.com Cc: , From: Date: Sat, 22 Jul 2017 15:32:47 +0200 Message-ID: <150073036713626@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 4a16d1cb245c56e72fd40a28f3cdb394cde4b341 Mon Sep 17 00:00:00 2001 From: Ankit Kumar 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 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. Reported-by: Anton Blanchard Signed-off-by: Ankit Kumar Reviewed-by: Mahesh Salgaonkar Signed-off-by: Kees Cook Fixes: 9abdcccc3d5f ("pstore: Extract common arguments into structure") Signed-off-by: Greg Kroah-Hartman --- fs/pstore/platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -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 ankit@linux.vnet.ibm.com are queue-4.12/pstore-don-t-warn-if-data-is-uncompressed-and-type-is-not-pstore_type_dmesg.patch