GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysfs: flatten and fix sysfs_rename_dir() error handling

Browse source 
Error handling in sysfs_rename_dir() was broken.

* When lookup_one_len() fails, 0 is returned.

* If parent inode check fails, returns with inode mutex and rename
  rwsem held.

This patch fixes the above bugs and flattens error handling such that
it's more readable and easier to modify.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tejun Heo 2007-06-14 03:45:14 +09:00 • committed by Greg Kroah-Hartman
parent dfeb9fb034
commit 996b73764e
1 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

47
fs/sysfs/dir.c
View file

@ -452,8 +452,9 @@ void sysfs_remove_dir(struct kobject * kobj)
int sysfs_rename_dir(struct kobject * kobj, struct dentry *new_parent, int sysfs_rename_dir(struct kobject * kobj, struct dentry *new_parent,
const char *new_name) const char *new_name)
{ {
int error = 0; int error;
struct dentry * new_dentry; struct dentry * new_dentry;
struct sysfs_dirent *sd, *parent_sd;
if (!new_parent) if (!new_parent)
return -EFAULT; return -EFAULT;
@ -462,21 +463,28 @@ int sysfs_rename_dir(struct kobject * kobj, struct dentry *new_parent,
mutex_lock(&new_parent->d_inode->i_mutex); mutex_lock(&new_parent->d_inode->i_mutex);
new_dentry = lookup_one_len(new_name, new_parent, strlen(new_name)); new_dentry = lookup_one_len(new_name, new_parent, strlen(new_name));
if (!IS_ERR(new_dentry)) { if (IS_ERR(new_dentry)) {
/* By allowing two different directories with the error = PTR_ERR(new_dentry);
* same d_parent we allow this routine to move goto out_unlock;
* between different shadows of the same directory }
/* By allowing two different directories with the same
* d_parent we allow this routine to move between different
* shadows of the same directory
*/ */
if (kobj->dentry->d_parent->d_inode != new_parent->d_inode)
return -EINVAL;
else if (new_dentry->d_parent->d_inode != new_parent->d_inode)
error = -EINVAL; error = -EINVAL;
else if (new_dentry == kobj->dentry) if (kobj->dentry->d_parent->d_inode != new_parent->d_inode ||
error = -EINVAL; new_dentry->d_parent->d_inode != new_parent->d_inode ||
else if (!new_dentry->d_inode) { new_dentry == kobj->dentry)
goto out_dput;
error = -EEXIST;
if (new_dentry->d_inode)
goto out_dput;
error = kobject_set_name(kobj, "%s", new_name); error = kobject_set_name(kobj, "%s", new_name);
if (!error) { if (error)
struct sysfs_dirent *sd, *parent_sd; goto out_drop;
d_add(new_dentry, NULL); d_add(new_dentry, NULL);
d_move(kobj->dentry, new_dentry); d_move(kobj->dentry, new_dentry);
@ -486,16 +494,17 @@ int sysfs_rename_dir(struct kobject * kobj, struct dentry *new_parent,
list_del_init(&sd->s_sibling); list_del_init(&sd->s_sibling);
list_add(&sd->s_sibling, &parent_sd->s_children); list_add(&sd->s_sibling, &parent_sd->s_children);
}
else error = 0;
goto out_unlock;
out_drop:
d_drop(new_dentry); d_drop(new_dentry);
} else out_dput:
error = -EEXIST;
dput(new_dentry); dput(new_dentry);
} out_unlock:
mutex_unlock(&new_parent->d_inode->i_mutex); mutex_unlock(&new_parent->d_inode->i_mutex);
up_write(&sysfs_rename_sem); up_write(&sysfs_rename_sem);
return error; return error;
} }