Commit 17f79be9 authored Jul 09, 2012 by Andrew Morton Committed by Greg Kroah-Hartman Jul 17, 2012

sysfs: fail dentry revalidation after namespace change fix

don't assume that KOBJ_NS_TYPE_NONE==0.  Also save a test-n-branch.

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e5bcac61

fs/sysfs/dir.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -329,10 +329,12 @@ static int sysfs_dentry_revalidate(struct dentry dentry, struct nameidata nd)

		/* The sysfs dirent has been moved to a different namespace */
		type = KOBJ_NS_TYPE_NONE;
		if (sd->s_parent)
		if (sd->s_parent) {
		type = sysfs_ns_type(sd->s_parent);
		if (type && (sysfs_info(dentry->d_sb)->ns[type] != sd->s_ns))
		if (type != KOBJ_NS_TYPE_NONE &&
		sysfs_info(dentry->d_sb)->ns[type] != sd->s_ns)
		goto out_bad;
		}

		mutex_unlock(&sysfs_mutex);
		out_valid: