openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pstore: Add decompression support to pstore 

Based on the flag 'compressed' set or not, pstore will decompress the
data returning a plain text file. If decompression fails for a particular
record it will have the compressed data in the file which can be
decompressed with 'openssl' command line tool.

Signed-off-by: Aruna Balakrishnaiah <aruna@linux.vnet.ibm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Aruna Balakrishnaiah 2013-08-16 13:53:28 -07:00 committed by Tony Luck
parent 9a4e139820
commit adb42f5e10
1 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fs/pstore/platform.c
View File

@ -162,6 +162,36 @@ static int pstore_compress(const void *in, void *out, size_t inlen,
return ret; return ret;
} }
/* Derived from logfs_uncompress */
static int pstore_decompress(void *in, void *out, size_t inlen, size_t outlen)
{
int err, ret;
ret = -EIO;
err = zlib_inflateInit(&stream);
if (err != Z_OK)
goto error;
stream.next_in = in;
stream.avail_in = inlen;
stream.total_in = 0;
stream.next_out = out;
stream.avail_out = outlen;
stream.total_out = 0;
err = zlib_inflate(&stream, Z_FINISH);
if (err != Z_STREAM_END)
goto error;
err = zlib_inflateEnd(&stream);
if (err != Z_OK)
goto error;
ret = stream.total_out;
error:
return ret;
}
static void allocate_buf_for_compression(void) static void allocate_buf_for_compression(void)
{ {
size_t size; size_t size;
@ -429,6 +459,7 @@ void pstore_get_records(int quiet)
struct timespec time; struct timespec time;
int failed = 0, rc; int failed = 0, rc;
bool compressed; bool compressed;
int unzipped_len = -1;
if (!psi) if (!psi)
return; return;
@ -439,10 +470,28 @@ void pstore_get_records(int quiet)
while ((size = psi->read(&id, &type, &count, &time, &buf, &compressed, while ((size = psi->read(&id, &type, &count, &time, &buf, &compressed,
psi)) > 0) { psi)) > 0) {
if (compressed && (type == PSTORE_TYPE_DMESG)) {
if (big_oops_buf)
unzipped_len = pstore_decompress(buf,
big_oops_buf, size,
big_oops_buf_sz);
if (unzipped_len > 0) {
buf = big_oops_buf;
size = unzipped_len;
} else {
pr_err("pstore: decompression failed;"
"returned %d\n", unzipped_len);
}
}
rc = pstore_mkfile(type, psi->name, id, count, buf, rc = pstore_mkfile(type, psi->name, id, count, buf,
(size_t)size, time, psi); (size_t)size, time, psi);
kfree(buf); if (unzipped_len < 0) {
buf = NULL; /* Free buffer other than big oops */
kfree(buf);
buf = NULL;
} else
unzipped_len = -1;
if (rc && (rc != -EEXIST || !quiet)) if (rc && (rc != -EEXIST || !quiet))
failed++; failed++;
} }