mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
sysfs: avoid kmem_cache_free(NULL)
kmem_cache_free() with NULL is not allowed. But it may happen if out of memory error is triggered in sysfs_new_dirent(). This patch fixes that error handling. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
3f8df781fc
commit
01da2425f3
1 changed files with 7 additions and 6 deletions
|
@ -361,20 +361,20 @@ static struct dentry_operations sysfs_dentry_ops = {
|
|||
struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)
|
||||
{
|
||||
char *dup_name = NULL;
|
||||
struct sysfs_dirent *sd = NULL;
|
||||
struct sysfs_dirent *sd;
|
||||
|
||||
if (type & SYSFS_COPY_NAME) {
|
||||
name = dup_name = kstrdup(name, GFP_KERNEL);
|
||||
if (!name)
|
||||
goto err_out;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sd = kmem_cache_zalloc(sysfs_dir_cachep, GFP_KERNEL);
|
||||
if (!sd)
|
||||
goto err_out;
|
||||
goto err_out1;
|
||||
|
||||
if (sysfs_alloc_ino(&sd->s_ino))
|
||||
goto err_out;
|
||||
goto err_out2;
|
||||
|
||||
atomic_set(&sd->s_count, 1);
|
||||
atomic_set(&sd->s_active, 0);
|
||||
|
@ -386,9 +386,10 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)
|
|||
|
||||
return sd;
|
||||
|
||||
err_out:
|
||||
kfree(dup_name);
|
||||
err_out2:
|
||||
kmem_cache_free(sysfs_dir_cachep, sd);
|
||||
err_out1:
|
||||
kfree(dup_name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue