From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@hitachi.com>,
Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
Matt Fleming <matt@codeblueprint.co.uk>,
Nathan Fontenot <nfont@linux.vnet.ibm.com>,
Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>,
Daniel Axtens <dja@axtens.net>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Geliang Tang <geliangtang@163.com>,
linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org,
linux-efi@vger.kernel.org, linux-doc@vger.kernel.org
Subject: [PATCH 07/18] pstore: Move record decompression to function
Date: Mon, 6 Mar 2017 13:55:21 -0800 [thread overview]
Message-ID: <1488837332-71582-8-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1488837332-71582-1-git-send-email-keescook@chromium.org>
This moves the record decompression logic out to a separate function
to avoid the deep indentation.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/pstore/platform.c | 67 +++++++++++++++++++++++++++++-----------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 3fa1575a6e36..0503380704de 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -757,6 +757,37 @@ void pstore_unregister(struct pstore_info *psi)
}
EXPORT_SYMBOL_GPL(pstore_unregister);
+static void decompress_record(struct pstore_record *record)
+{
+ int unzipped_len;
+
+ /* Only PSTORE_TYPE_DMESG support compression. */
+ if (!record->compressed || record->type != PSTORE_TYPE_DMESG) {
+ pr_warn("ignored compressed record type %d\n", record->type);
+ return;
+ }
+
+ /* No compression method has created the common buffer. */
+ if (!big_oops_buf) {
+ pr_warn("no decompression buffer allocated\n");
+ return;
+ }
+
+ unzipped_len = pstore_decompress(record->buf, big_oops_buf,
+ record->size, big_oops_buf_sz);
+ if (unzipped_len > 0) {
+ if (record->ecc_notice_size)
+ memcpy(big_oops_buf + unzipped_len,
+ record->buf + record->size,
+ record->ecc_notice_size);
+ kfree(record->buf);
+ record->buf = big_oops_buf;
+ record->size = unzipped_len;
+ record->compressed = false;
+ } else
+ pr_err("decompression failed: %d\n", unzipped_len);
+}
+
/*
* Read all the records from the persistent store. Create
* files in our filesystem. Don't warn about -EEXIST errors
@@ -768,7 +799,6 @@ void pstore_get_records(int quiet)
struct pstore_info *psi = psinfo;
struct pstore_record record = { .psi = psi, };
int failed = 0, rc;
- int unzipped_len = -1;
if (!psi)
return;
@@ -782,41 +812,18 @@ void pstore_get_records(int quiet)
&record.buf, &record.compressed,
&record.ecc_notice_size,
record.psi)) > 0) {
- if (record.compressed &&
- record.type == PSTORE_TYPE_DMESG) {
- if (big_oops_buf)
- unzipped_len = pstore_decompress(
- record.buf,
- big_oops_buf,
- record.size,
- big_oops_buf_sz);
-
- if (unzipped_len > 0) {
- if (record.ecc_notice_size)
- memcpy(big_oops_buf + unzipped_len,
- record.buf + recorrecord.size,
- record.ecc_notice_size);
- kfree(record.buf);
- record.buf = big_oops_buf;
- record.size = unzipped_len;
- record.compressed = false;
- } else {
- pr_err("decompression failed;returned %d\n",
- unzipped_len);
- record.compressed = true;
- }
- }
+
+ decompress_record(&record);
rc = pstore_mkfile(record.type, psi->name, record.id,
record.count, record.buf,
record.compressed,
record.size + record.ecc_notice_size,
record.time, record.psi);
- if (unzipped_len < 0) {
- /* Free buffer other than big oops */
+
+ /* Free buffer other than big oops */
+ if (record.buf != big_oops_buf)
kfree(record.buf);
- record.buf = NULL;
- } else
- unzipped_len = -1;
+
if (rc && (rc != -EEXIST || !quiet))
failed++;
--
2.7.4
next prev parent reply other threads:[~2017-03-06 21:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 21:55 [PATCH 00/18] pstore: refactor internal APIs Kees Cook
2017-03-06 21:55 ` [PATCH 01/18] pstore: Use dynamic spinlock initializer Kees Cook
2017-03-06 21:55 ` [PATCH 02/18] pstore: Shut down worker when unregistering Kees Cook
2017-03-06 21:55 ` [PATCH 03/18] pstore: Avoid race in module unloading Kees Cook
2017-03-07 16:16 ` Namhyung Kim
2017-03-07 16:18 ` Kees Cook
2017-03-06 21:55 ` [PATCH 04/18] pstore: Improve register_pstore() error reporting Kees Cook
2017-03-06 21:55 ` [PATCH 05/18] pstore: Add kernel-doc for struct pstore_info Kees Cook
2017-03-06 21:55 ` [PATCH 06/18] pstore: Extract common arguments into structure Kees Cook
2017-03-07 16:22 ` Namhyung Kim
2017-03-07 19:31 ` Kees Cook
2017-03-06 21:55 ` Kees Cook [this message]
2017-03-06 21:55 ` [PATCH 08/18] pstore: Switch pstore_mkfile to pass record Kees Cook
2017-03-06 21:55 ` [PATCH 09/18] pstore: Replace arguments for read() API Kees Cook
2017-03-06 21:55 ` [PATCH 10/18] pstore: Replace arguments for write() API Kees Cook
2017-03-06 21:55 ` [PATCH 11/18] pstore: Always allocate buffer for decompression Kees Cook
2017-03-06 21:55 ` [PATCH 12/18] pstore: Pass record contents instead of copying Kees Cook
2017-03-06 21:55 ` [PATCH 13/18] pstore: Allocate records on heap instead of stack Kees Cook
2017-03-06 21:55 ` [PATCH 14/18] pstore: Do not duplicate record metadata Kees Cook
2017-03-06 21:55 ` [PATCH 15/18] pstore: Replace arguments for erase() API Kees Cook
2017-03-06 21:55 ` [PATCH 16/18] pstore: Replace arguments for write_buf() API Kees Cook
2017-03-06 21:55 ` [PATCH 17/18] pstore: Replace arguments for write_buf_user() API Kees Cook
2017-03-06 21:55 ` [PATCH 18/18] pstore: Remove write_buf() callback Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488837332-71582-8-git-send-email-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=anton@enomsg.org \
--cc=ard.biesheuvel@linaro.org \
--cc=benh@kernel.crashing.org \
--cc=ccross@android.com \
--cc=dja@axtens.net \
--cc=geliangtang@163.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=matt@codeblueprint.co.uk \
--cc=mpe@ellerman.id.au \
--cc=nfont@linux.vnet.ibm.com \
--cc=nobuhiro.iwamatsu.kw@hitachi.com \
--cc=paul.gortmaker@windriver.com \
--cc=paulus@samba.org \
--cc=qiuxu.zhuo@intel.com \
--cc=rjw@rjwysocki.net \
--cc=tony.luck@intel.com \
--cc=xinhui.pan@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).