diff options
author | Louis Rilling <Louis.Rilling@kerlabs.com> | 2008-06-16 13:00:59 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-07-14 16:57:16 -0400 |
commit | 5301a77da2da1e4c22573e0e8d394a653b8ad9f9 (patch) | |
tree | c2a6186510c3a4502d923cf3f5d445fa821cb277 /fs/configfs/symlink.c | |
parent | 6f61076406251626be39651d114fac412b1e0c39 (diff) |
configfs: Protect configfs_dirent s_links list mutations
Symlinks to a config_item are listed under its configfs_dirent s_links, but the
list mutations are not protected by any common lock.
This patch uses the configfs_dirent_lock spinlock to add the necessary
protection.
Note: we should also protect the list_empty() test in configfs_detach_prep() but
1/ the lock should not be released immediately because nothing would prevent the
list from being filled after a successful list_empty() test, making the problem
tricky,
2/ this will be solved by the rmdir() vs rename() deadlock bugfix.
Signed-off-by: Louis Rilling <Louis.Rilling@kerlabs.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/configfs/symlink.c')
-rw-r--r-- | fs/configfs/symlink.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c index 676c84c416da..faeb4417a10d 100644 --- a/fs/configfs/symlink.c +++ b/fs/configfs/symlink.c | |||
@@ -77,12 +77,15 @@ static int create_link(struct config_item *parent_item, | |||
77 | sl = kmalloc(sizeof(struct configfs_symlink), GFP_KERNEL); | 77 | sl = kmalloc(sizeof(struct configfs_symlink), GFP_KERNEL); |
78 | if (sl) { | 78 | if (sl) { |
79 | sl->sl_target = config_item_get(item); | 79 | sl->sl_target = config_item_get(item); |
80 | /* FIXME: needs a lock, I'd bet */ | 80 | spin_lock(&configfs_dirent_lock); |
81 | list_add(&sl->sl_list, &target_sd->s_links); | 81 | list_add(&sl->sl_list, &target_sd->s_links); |
82 | spin_unlock(&configfs_dirent_lock); | ||
82 | ret = configfs_create_link(sl, parent_item->ci_dentry, | 83 | ret = configfs_create_link(sl, parent_item->ci_dentry, |
83 | dentry); | 84 | dentry); |
84 | if (ret) { | 85 | if (ret) { |
86 | spin_lock(&configfs_dirent_lock); | ||
85 | list_del_init(&sl->sl_list); | 87 | list_del_init(&sl->sl_list); |
88 | spin_unlock(&configfs_dirent_lock); | ||
86 | config_item_put(item); | 89 | config_item_put(item); |
87 | kfree(sl); | 90 | kfree(sl); |
88 | } | 91 | } |
@@ -186,8 +189,9 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry) | |||
186 | type->ct_item_ops->drop_link(parent_item, | 189 | type->ct_item_ops->drop_link(parent_item, |
187 | sl->sl_target); | 190 | sl->sl_target); |
188 | 191 | ||
189 | /* FIXME: Needs lock */ | 192 | spin_lock(&configfs_dirent_lock); |
190 | list_del_init(&sl->sl_list); | 193 | list_del_init(&sl->sl_list); |
194 | spin_unlock(&configfs_dirent_lock); | ||
191 | 195 | ||
192 | /* Put reference from create_link() */ | 196 | /* Put reference from create_link() */ |
193 | config_item_put(sl->sl_target); | 197 | config_item_put(sl->sl_target); |