summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-05-08 16:23:30 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-05-09 10:51:34 -0400
commitb0c4f3222c7406f0aee9d52b7d604a1d36108463 (patch)
treeed7bcb1f3ff828b90794453d8101cb7ecba05bf3
parent2a32cebd6cbcc43996c3e2d114fa32ba1e71192a (diff)
downloadop-kernel-dev-b0c4f3222c7406f0aee9d52b7d604a1d36108463.zip
op-kernel-dev-b0c4f3222c7406f0aee9d52b7d604a1d36108463.tar.gz
Fix the race between capifs remount and node creation
we don't want to deal with half-updated config Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/isdn/capi/capifs.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 8f9f3b5..bff72d8 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -75,14 +75,17 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
}
}
- replace_mount_options(s, new_opt);
+ mutex_lock(&s->s_root->d_inode->i_mutex);
+ replace_mount_options(s, new_opt);
config.setuid = setuid;
config.setgid = setgid;
config.uid = uid;
config.gid = gid;
config.mode = mode;
+ mutex_unlock(&s->s_root->d_inode->i_mutex);
+
return 0;
}
@@ -153,13 +156,16 @@ void capifs_new_ncci(unsigned int number, dev_t device)
if (!inode)
return;
inode->i_ino = number+2;
+
+ dentry = get_node(number);
+
+ /* config contents is protected by root's i_mutex */
inode->i_uid = config.setuid ? config.uid : current_fsuid();
inode->i_gid = config.setgid ? config.gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|config.mode, device);
//inode->i_op = &capifs_file_inode_operations;
- dentry = get_node(number);
if (!IS_ERR(dentry) && !dentry->d_inode)
d_instantiate(dentry, inode);
mutex_unlock(&capifs_root->d_inode->i_mutex);
OpenPOWER on IntegriCloud