summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2010-10-20 18:49:20 +0200
committerJan Kara <jack@suse.cz>2011-01-06 17:03:55 +0100
commit949f4a7c08bc4a050eae7aeeac3e6d019d1feafb (patch)
treec017198a51ce2404c119fbe5bd8f497154efb0bc
parentd664b6af609ecf5e7dcedf92f0bf188e3a29b3e0 (diff)
downloadlinux-3.10-949f4a7c08bc4a050eae7aeeac3e6d019d1feafb.tar.gz
linux-3.10-949f4a7c08bc4a050eae7aeeac3e6d019d1feafb.tar.bz2
linux-3.10-949f4a7c08bc4a050eae7aeeac3e6d019d1feafb.zip
udf: Protect all modifications of LVID with s_alloc_mutex
udf_open_lvid() and udf_close_lvid() were modifying LVID without s_alloc_mutex. Since they can be called from remount, the modification could race with other filesystem modifications of LVID so protect them by s_alloc_mutex just to be sure. Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/udf/super.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 948e1aca0f3..e54960c0e96 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1773,6 +1773,8 @@ static void udf_open_lvid(struct super_block *sb)
if (!bh)
return;
+
+ mutex_lock(&sbi->s_alloc_mutex);
lvid = (struct logicalVolIntegrityDesc *)bh->b_data;
lvidiu = udf_sb_lvidiu(sbi);
@@ -1789,6 +1791,7 @@ static void udf_open_lvid(struct super_block *sb)
lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag);
mark_buffer_dirty(bh);
sbi->s_lvid_dirty = 0;
+ mutex_unlock(&sbi->s_alloc_mutex);
}
static void udf_close_lvid(struct super_block *sb)
@@ -1801,6 +1804,7 @@ static void udf_close_lvid(struct super_block *sb)
if (!bh)
return;
+ mutex_lock(&sbi->s_alloc_mutex);
lvid = (struct logicalVolIntegrityDesc *)bh->b_data;
lvidiu = udf_sb_lvidiu(sbi);
lvidiu->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
@@ -1821,6 +1825,7 @@ static void udf_close_lvid(struct super_block *sb)
lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag);
mark_buffer_dirty(bh);
sbi->s_lvid_dirty = 0;
+ mutex_unlock(&sbi->s_alloc_mutex);
}
u64 lvid_get_unique_id(struct super_block *sb)