powerpc/pseries: Read and write to the 'compressed' flag of pstore

If data returned from pstore is compressed, nvram's write callback
will add a flag ERR_TYPE_KERNEL_PANIC_GZ indicating the data is compressed
while writing to nvram. If the data read from nvram is compressed, nvram's
read callback will set the flag 'compressed'. The patch adds backward
compatibilty with old format oops header when reading from pstore.

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>

diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 6c4dc52ac0b518d8fca9971f6986ca5474f33ab2..d276cd3edd8f51641db54dfb459cb2efe4fa7f91 100644 (file)
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -581,6 +581,9 @@ static int nvram_pstore_write(enum pstore_type_id type,
        oops_hdr->report_length = (u16) size;
        oops_hdr->timestamp = get_seconds();
 
+       if (compressed)
+               err_type = ERR_TYPE_KERNEL_PANIC_GZ;
+
        rc = nvram_write_os_partition(&oops_log_partition, oops_buf,
                (int) (sizeof(*oops_hdr) + size), err_type, count);
 
@@ -687,6 +690,11 @@ static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
                        return -ENOMEM;
                memcpy(*buf, buff + hdr_size, length);
                kfree(buff);
+
+               if (err_type == ERR_TYPE_KERNEL_PANIC_GZ)
+                       *compressed = true;
+               else
+                       *compressed = false;
                return length;
        }