pstore: Add priv field to pstore_record for backend specific use

The EFI pstore backend will need to store per-record variable name data
when we switch away from the efivars layer. Add a priv field to struct
pstore_record, and document it as holding a backend specific pointer
that is assumed to be a kmalloc()d buffer, and will be kfree()d when the
entire record is freed.

Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 14658b009f1bb8b1d114021b68d5f56d18ae4ea0..ffbadb8b3032d04938411fea3aa90299de8c2946 100644 (file)
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -55,6 +55,7 @@ static void free_pstore_private(struct pstore_private *private)
                return;
        if (private->record) {
                kfree(private->record->buf);
+               kfree(private->record->priv);
                kfree(private->record);
        }
        kfree(private);

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index e26162f102ffe51bd0cae29db0962e0886d97ac2..0c034ea399547b33f5864bde433389b6f012b107 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -769,6 +769,7 @@ void pstore_get_backend_records(struct pstore_info *psi,
                if (rc) {
                        /* pstore_mkfile() did not take record, so free it. */
                        kfree(record->buf);
+                       kfree(record->priv);
                        kfree(record);
                        if (rc != -EEXIST || !quiet)
                                failed++;

diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index e97a8188f0fd8bcac0e0edd8a5570c7aa00edf9d..638507a3c8ff194e22a27955ca40dab238328f2f 100644 (file)
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -57,6 +57,9 @@ struct pstore_info;
  * @size:      size of @buf
  * @ecc_notice_size:
  *             ECC information for @buf
+ * @priv:      pointer for backend specific use, will be
+ *             kfree()d by the pstore core if non-NULL
+ *             when the record is freed.
  *
  * Valid for PSTORE_TYPE_DMESG @type:
  *
@@ -74,6 +77,7 @@ struct pstore_record {
        char                    *buf;
        ssize_t                 size;
        ssize_t                 ecc_notice_size;
+       void                    *priv;
 
        int                     count;
        enum kmsg_dump_reason   reason;