pstore: fix use after free
PATCH 1/1 pstore: fix use after free
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.
--- fs/pstore/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/pstore/inode.c +2 -1
@@ -333,7 +333,6 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) private =kzalloc (sizeof (*private),GFP_KERNEL );if (!private) goto fail_alloc; - private->record = record;switch (record->type) {case PSTORE_TYPE_DMESG :
@@ -387,6 +386,8 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)if (!dentry) goto fail_private; + private->record = record; + inode->i_size = private->total_size = size; inode->i_private = private;
Signature · 12 lines
2.7.4 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Ralf Herbrich Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
Kees Cook
AppliedQuoted 11 lines · Norbert Manthey
The
pstore_mkfile()function is passed a pointer to a structpstore_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.
Yup, good catch. Looks like a double-free in the one failure case.
Quoted 1 line
Signed-off-by Norbert Manthey <[email protected]>
Applied to my pstore tree. :)
-Kees
Quoted 40 lines
--- fs/pstore/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/pstore/inode.c +2
-1@@ -333,7 +333,6 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) private =kzalloc (sizeof (*private),GFP_KERNEL );if (!private) goto fail_alloc; - private->record = record;switch (record->type) {case PSTORE_TYPE_DMESG :@@ -387,6 +386,8 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)if (!dentry) goto fail_private; + private->record = record; + inode->i_size = private->total_size = size; inode->i_private = private;Signature · 12 lines
2.7.4 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Ralf Herbrich Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
Signature · 1 line
Kees Cook