Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=01da2425f327d7ac673e594bee5655523115970b
Commit:     01da2425f327d7ac673e594bee5655523115970b
Parent:     3f8df781fc5f9ee5253a54ba669e1c8872844b86
Author:     Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Sat Jul 14 11:03:35 2007 +0900
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Jul 18 15:49:49 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 fs/sysfs/dir.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index aee966c..2e6775a 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to