Commit 09afa9e3 authored by Norbert Manthey's avatar Norbert Manthey Committed by Greg Kroah-Hartman

pstore: Fix double-free in pstore_mkfile() failure path

commit 4c6d80e1 upstream.

The pstore_mkfile() function is passed a pointer to a struct
pstore_record. On success it consumes this 'record' pointer and
references it from the created inode.

On failure, however, it may or may not free the record. There are even
two different code paths which return -ENOMEM -- one of which does and
the other doesn't free the record.

Make the behaviour deterministic by never consuming and freeing the
record when returning failure, allowing the caller to do the cleanup
consistently.
Signed-off-by: default avatarNorbert Manthey <nmanthey@amazon.de>
Link: https://lore.kernel.org/r/1562331960-26198-1-git-send-email-nmanthey@amazon.de
Fixes: 83f70f07 ("pstore: Do not duplicate record metadata")
Fixes: 1dfff7dd ("pstore: Pass record contents instead of copying")
Cc: stable@vger.kernel.org
[kees: also move "private" allocation location, rename inode cleanup label]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61c3ed42
...@@ -330,22 +330,21 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) ...@@ -330,22 +330,21 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
goto fail; goto fail;
inode->i_mode = S_IFREG | 0444; inode->i_mode = S_IFREG | 0444;
inode->i_fop = &pstore_file_operations; inode->i_fop = &pstore_file_operations;
private = kzalloc(sizeof(*private), GFP_KERNEL);
if (!private)
goto fail_alloc;
private->record = record;
scnprintf(name, sizeof(name), "%s-%s-%llu%s", scnprintf(name, sizeof(name), "%s-%s-%llu%s",
pstore_type_to_name(record->type), pstore_type_to_name(record->type),
record->psi->name, record->id, record->psi->name, record->id,
record->compressed ? ".enc.z" : ""); record->compressed ? ".enc.z" : "");
private = kzalloc(sizeof(*private), GFP_KERNEL);
if (!private)
goto fail_inode;
dentry = d_alloc_name(root, name); dentry = d_alloc_name(root, name);
if (!dentry) if (!dentry)
goto fail_private; goto fail_private;
private->record = record;
inode->i_size = private->total_size = size; inode->i_size = private->total_size = size;
inode->i_private = private; inode->i_private = private;
if (record->time.tv_sec) if (record->time.tv_sec)
...@@ -361,7 +360,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) ...@@ -361,7 +360,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
fail_private: fail_private:
free_pstore_private(private); free_pstore_private(private);
fail_alloc: fail_inode:
iput(inode); iput(inode);
fail: fail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment