Skip to content

Commit

Permalink
sysfs: avoid kmem_cache_free(NULL)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Akinobu Mita authored and Greg Kroah-Hartman committed Jul 18, 2007
1 parent 3f8df78 commit 01da242
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions fs/sysfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit 01da242

Please sign in to comment.