aboutsummaryrefslogtreecommitdiffstats
path: root/fs/configfs/dir.c
diff options
context:
space:
mode:
authorLouis Rilling <louis.rilling@kerlabs.com>2008-06-23 08:16:17 -0400
committerMark Fasheh <mfasheh@suse.com>2008-07-31 19:21:12 -0400
commit4768e9b18dc63719209c68920d4ae52dc49b6161 (patch)
treeee9e805c405ea6a6cdf44ba30fd66047bc522b1b /fs/configfs/dir.c
parentdacdd0e04768da1fd2b24a6ee274c582b40d0c5b (diff)
[PATCH] configfs: Fix symlink() to a removing item
The rule for configfs symlinks is that symlinks always point to valid config_items, and prevent the target from being removed. However, configfs_symlink() only checks that it can grab a reference on the target item, without ensuring that it remains alive until the symlink is correctly attached. This patch makes configfs_symlink() fail whenever the target is being removed, using the CONFIGFS_USET_DROPPING flag set by configfs_detach_prep() and protected by configfs_dirent_lock. This patch introduces a similar (weird?) behavior as with mkdir failures making rmdir fail: if symlink() races with rmdir() of the parent directory (or its youngest user-created ancestor if parent is a default group) or rmdir() of the target directory, and then fails in configfs_create(), this can make the racing rmdir() fail despite the concerned directory having no user-created entry (resp. no symlink pointing to it or one of its default groups) in the end. This behavior is fixed in later patches. Signed-off-by: Louis Rilling <louis.rilling@kerlabs.com> Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/configfs/dir.c')
-rw-r--r--fs/configfs/dir.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 2495f23e33f4..cb5ea44846af 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -370,6 +370,9 @@ static int configfs_detach_prep(struct dentry *dentry, struct mutex **wait_mutex
370 struct configfs_dirent *sd; 370 struct configfs_dirent *sd;
371 int ret; 371 int ret;
372 372
373 /* Mark that we're trying to drop the group */
374 parent_sd->s_type |= CONFIGFS_USET_DROPPING;
375
373 ret = -EBUSY; 376 ret = -EBUSY;
374 if (!list_empty(&parent_sd->s_links)) 377 if (!list_empty(&parent_sd->s_links))
375 goto out; 378 goto out;
@@ -385,8 +388,6 @@ static int configfs_detach_prep(struct dentry *dentry, struct mutex **wait_mutex
385 *wait_mutex = &sd->s_dentry->d_inode->i_mutex; 388 *wait_mutex = &sd->s_dentry->d_inode->i_mutex;
386 return -EAGAIN; 389 return -EAGAIN;
387 } 390 }
388 /* Mark that we're trying to drop the group */
389 sd->s_type |= CONFIGFS_USET_DROPPING;
390 391
391 /* 392 /*
392 * Yup, recursive. If there's a problem, blame 393 * Yup, recursive. If there's a problem, blame
@@ -414,12 +415,11 @@ static void configfs_detach_rollback(struct dentry *dentry)
414 struct configfs_dirent *parent_sd = dentry->d_fsdata; 415 struct configfs_dirent *parent_sd = dentry->d_fsdata;
415 struct configfs_dirent *sd; 416 struct configfs_dirent *sd;
416 417
417 list_for_each_entry(sd, &parent_sd->s_children, s_sibling) { 418 parent_sd->s_type &= ~CONFIGFS_USET_DROPPING;
418 if (sd->s_type & CONFIGFS_USET_DEFAULT) { 419
420 list_for_each_entry(sd, &parent_sd->s_children, s_sibling)
421 if (sd->s_type & CONFIGFS_USET_DEFAULT)
419 configfs_detach_rollback(sd->s_dentry); 422 configfs_detach_rollback(sd->s_dentry);
420 sd->s_type &= ~CONFIGFS_USET_DROPPING;
421 }
422 }
423} 423}
424 424
425static void detach_attrs(struct config_item * item) 425static void detach_attrs(struct config_item * item)