pstore: d_alloc_name() doesn't return an ERR_PTR

PATCH In review Dan Carpenter 3 participants 3 messages Aug 14, 2013

Subsystems (2)

Kernel janitors Pstore filesystem

lore

Share & tools

lore

Dan Carpenter

author

2013-08-14 11:52 UTC #0 lore raw

PATCH 1/1 pstore: d_alloc_name() doesn't return an ERR_PTR

d_alloc_name() returns NULL on error. Also I changed the error code from -ENOSPC to -ENOMEM to reflect that we were short on RAM not disk space.

Signed-off-by Dan Carpenter <[email protected]>

fs/pstore/inode.c +1 -2

index 71bf5f4..6a4123d 100644
@@ -345,9 +345,8 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
 
 	mutex_lock(&root->d_inode->i_mutex);
 
-	rc = -ENOSPC;
 	dentry = d_alloc_name(root, name);
-	if (IS_ERR(dentry))
+	if (!dentry)
 		goto fail_lockedalloc;
 
 	memcpy(private->data, data, size);

Kees Cook

Acked-by on v1 1/1

2013-08-14 14:25 UTC #1 lore raw

Quoted 5 lines · Dan Carpenter

d_alloc_name() returns NULL on error. Also I changed the error code from -ENOSPC to -ENOMEM to reflect that we were short on RAM not disk space.
Signed-off-by Dan Carpenter <[email protected]>

Thanks for the catch!

Acked-by Kees Cook <[email protected]>

Signature · 2 lines

Kees Cook
Chrome OS Security

Luck, Tony

reviewer

2013-08-14 17:59 UTC #2 lore raw

Quoted 5 lines

Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>
Thanks for the catch!
Acked-by Kees Cook <[email protected]>

Thanks. Applied.

-Tony