diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-08 16:05:57 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-09 10:51:34 -0400 |
commit | 2a32cebd6cbcc43996c3e2d114fa32ba1e71192a (patch) | |
tree | 0ad94849a7bc3e97cd19978005d1898c8bb44b36 /fs/reiserfs | |
parent | f9dbd05bc97d1d4f17c2057612f6a8e4dbd039e0 (diff) |
Fix races around the access to ->s_options
Put generic_show_options read access to s_options under rcu_read_lock,
split save_mount_options() into "we are setting it the first time"
(uses in foo_fill_super()) and "we are relacing and freeing the old one",
synchronize_rcu() before kfree() in the latter.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index d444fe0013a4..1215a4f50cd2 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -1316,8 +1316,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
1316 | } | 1316 | } |
1317 | 1317 | ||
1318 | out_ok: | 1318 | out_ok: |
1319 | kfree(s->s_options); | 1319 | replace_mount_options(s, new_opts); |
1320 | s->s_options = new_opts; | ||
1321 | return 0; | 1320 | return 0; |
1322 | 1321 | ||
1323 | out_err: | 1322 | out_err: |