diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-14 10:55:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-05 22:35:39 -0800 |
| commit | d6dd0c8127040899f815c2ed1667eb1b0b684f51 (patch) | |
| tree | 0f9f080f9c1d9e2c06a3031a9e103af1d4d2d098 /fs | |
| parent | 841eb01f53cdb78d840dc4000f103fa7dd4228d2 (diff) | |
| download | lwn-d6dd0c8127040899f815c2ed1667eb1b0b684f51.tar.gz lwn-d6dd0c8127040899f815c2ed1667eb1b0b684f51.zip | |
pstore: d_alloc_name() doesn't return an ERR_PTR
commit c39524e6744284452ef45480d3153bec28960c32 upstream.
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 <dan.carpenter@oracle.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: HuKeping <hukeping@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index eaba02d951d3..66c8c2fe86b7 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -336,9 +336,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); |