summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-03-03 16:59:29 -0800
committerKees Cook <keescook@chromium.org>2017-03-07 14:00:53 -0800
commit9abdcccc3d5f3c72f25cd48160f60d911353bee9 (patch)
tree891a1584afc611a8312c1abbc39b4d2996033adf /fs
parent0edae0b3ffa6fc968d63932347a4d74b0ad0340b (diff)
downloadlinux-stable-9abdcccc3d5f3c72f25cd48160f60d911353bee9.tar.gz
linux-stable-9abdcccc3d5f3c72f25cd48160f60d911353bee9.tar.bz2
linux-stable-9abdcccc3d5f3c72f25cd48160f60d911353bee9.zip
pstore: Extract common arguments into structure
The read/mkfile pair pass the same arguments and should be cleared between calls. Move to a structure and wipe it after every loop. Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/platform.c55
1 files changed, 30 insertions, 25 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 320a673ecb5b..f45228eac3e6 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -766,16 +766,9 @@ EXPORT_SYMBOL_GPL(pstore_unregister);
void pstore_get_records(int quiet)
{
struct pstore_info *psi = psinfo;
- char *buf = NULL;
- ssize_t size;
- u64 id;
- int count;
- enum pstore_type_id type;
- struct timespec time;
+ struct pstore_record record = { .psi = psi, };
int failed = 0, rc;
- bool compressed;
int unzipped_len = -1;
- ssize_t ecc_notice_size = 0;
if (!psi)
return;
@@ -784,39 +777,51 @@ void pstore_get_records(int quiet)
if (psi->open && psi->open(psi))
goto out;
- while ((size = psi->read(&id, &type, &count, &time, &buf, &compressed,
- &ecc_notice_size, psi)) > 0) {
- if (compressed && (type == PSTORE_TYPE_DMESG)) {
+ while ((record.size = psi->read(&record.id, &record.type,
+ &record.count, &record.time,
+ &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(buf,
- big_oops_buf, size,
+ unzipped_len = pstore_decompress(
+ record.buf,
+ big_oops_buf,
+ record.size,
big_oops_buf_sz);
if (unzipped_len > 0) {
- if (ecc_notice_size)
+ if (record.ecc_notice_size)
memcpy(big_oops_buf + unzipped_len,
- buf + size, ecc_notice_size);
- kfree(buf);
- buf = big_oops_buf;
- size = unzipped_len;
- compressed = false;
+ 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;returned %d\n",
unzipped_len);
- compressed = true;
+ record.compressed = true;
}
}
- rc = pstore_mkfile(type, psi->name, id, count, buf,
- compressed, size + ecc_notice_size,
- time, psi);
+ 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 */
- kfree(buf);
- buf = NULL;
+ kfree(record.buf);
+ record.buf = NULL;
} else
unzipped_len = -1;
if (rc && (rc != -EEXIST || !quiet))
failed++;
+
+ memset(&record, 0, sizeof(record));
+ record.psi = psi;
}
if (psi->close)
psi->close(psi);