Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 456ef155 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

sysfs: fix bugs in sysfs_rename/move_dir() 



sysfs_rename/move_dir() have the following bugs.

 - On dentry lookup failure, kfree() is called on ERR_PTR() value.
 - sysfs_move_dir() has an extra dput() on success path.

Fix them.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e49452c6

fs/sysfs/dir.c

+3 −1
Original line number Diff line number Diff line
@@ -783,6 +783,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name) 
	old_dentry = sysfs_get_dentry(sd);

	if (IS_ERR(old_dentry)) {

		error = PTR_ERR(old_dentry);

		old_dentry = NULL;

		goto out;

	}
@@ -850,6 +851,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj) 
	old_dentry = sysfs_get_dentry(sd);

	if (IS_ERR(old_dentry)) {

		error = PTR_ERR(old_dentry);

		old_dentry = NULL;

		goto out;

	}

	old_parent = old_dentry->d_parent;
@@ -857,6 +859,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj) 
	new_parent = sysfs_get_dentry(new_parent_sd);

	if (IS_ERR(new_parent)) {

		error = PTR_ERR(new_parent);

		new_parent = NULL;

		goto out;

	}
@@ -880,7 +883,6 @@ again: 
	error = 0;

	d_add(new_dentry, NULL);

	d_move(old_dentry, new_dentry);

	dput(new_dentry);



	/* Remove from old parent's list and insert into new parent's list. */

	sysfs_unlink_sibling(sd);