aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2012-07-06 05:09:07 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-17 12:43:55 -0400
commite5bcac61472ca627241b394d439decd00bba3aea (patch)
tree0b95f76e13777099dcedaf7483e93d174b9f75f5 /fs/sysfs
parent47610d98e884dd47fd874469a105797e1a9f5ed0 (diff)
sysfs: fail dentry revalidation after namespace change
When we change the namespace tag of a sysfs entry, the associated dentry is still kept around. readdir() will work correctly and not display the old entries, but open() will still succeed, so will reads and writes. This will no longer happen if sysfs is remounted, hinting that this is a cache-related problem. I am using the following sequence to demonstrate that: shell1: ip link add type veth unshare -nm shell2: ip link set veth1 <pid_of_shell_1> cat /sys/devices/virtual/net/veth1/ifindex Before that patch, this will succeed (fail to fail). After it, it will correctly return an error. Differently from a normal rename, which we handle fine, changing the object namespace will keep it's path intact. So this check seems necessary as well. [ v2: get type from parent, as suggested by Eric Biederman ] Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Tejun Heo <tj@kernel.org> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/dir.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index e6bb9b2a4cbe..c0bf38a21caa 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -307,6 +307,7 @@ static int sysfs_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
307{ 307{
308 struct sysfs_dirent *sd; 308 struct sysfs_dirent *sd;
309 int is_dir; 309 int is_dir;
310 int type;
310 311
311 if (nd->flags & LOOKUP_RCU) 312 if (nd->flags & LOOKUP_RCU)
312 return -ECHILD; 313 return -ECHILD;
@@ -326,6 +327,13 @@ static int sysfs_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
326 if (strcmp(dentry->d_name.name, sd->s_name) != 0) 327 if (strcmp(dentry->d_name.name, sd->s_name) != 0)
327 goto out_bad; 328 goto out_bad;
328 329
330 /* The sysfs dirent has been moved to a different namespace */
331 type = KOBJ_NS_TYPE_NONE;
332 if (sd->s_parent)
333 type = sysfs_ns_type(sd->s_parent);
334 if (type && (sysfs_info(dentry->d_sb)->ns[type] != sd->s_ns))
335 goto out_bad;
336
329 mutex_unlock(&sysfs_mutex); 337 mutex_unlock(&sysfs_mutex);
330out_valid: 338out_valid:
331 return 1; 339 return 1;