GIT: unionfs2-2.6.27.y: USB: fix testing the wrong variable in fs_create_by_name()

Erez Zadok ezk at fsl.cs.sunysb.edu
Thu Aug 12 23:15:22 EDT 2010


commit d130b918879aa06a82cfac3bec5ec88e79a05f30
Author: Dan Carpenter <error27 at gmail.com>
Date:   Thu Apr 22 12:00:52 2010 +0200

    USB: fix testing the wrong variable in fs_create_by_name()
    
    commit fa7fe7af146a7b613e36a311eefbbfb5555325d1 upstream.
    
    There is a typo here.  We should be testing "*dentry" which was just
    assigned instead of "dentry".  This could result in dereferencing an
    ERR_PTR inside either usbfs_mkdir() or usbfs_create().
    
    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 83887ff..2c3cdbd 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -510,13 +510,13 @@ static int fs_create_by_name (const char *name, mode_t mode,
 	*dentry = NULL;
 	mutex_lock(&parent->d_inode->i_mutex);
 	*dentry = lookup_one_len(name, parent, strlen(name));
-	if (!IS_ERR(dentry)) {
+	if (!IS_ERR(*dentry)) {
 		if ((mode & S_IFMT) == S_IFDIR)
 			error = usbfs_mkdir (parent->d_inode, *dentry, mode);
 		else 
 			error = usbfs_create (parent->d_inode, *dentry, mode);
 	} else
-		error = PTR_ERR(dentry);
+		error = PTR_ERR(*dentry);
 	mutex_unlock(&parent->d_inode->i_mutex);
 
 	return error;


More information about the unionfs-cvs mailing list