---

yaml --- r: 207739 b: refs/heads/master c: 8800a04 h: refs/heads/master i: 207737: 0f4874f 207735: 9d17a0e v: v3
git-mirror · Jul 10, 2010 · eecff14 · eecff14
1 parent 5b9b6cb
commit eecff14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9442e54f433eff9b6fbd0836611df4c1919df370
+refs/heads/master: 8800a044c71a128633cf3febaf4780531a991334
diff --git a/trunk/fs/omfs/inode.c b/trunk/fs/omfs/inode.c
@@ -517,6 +517,12 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)
 			(unsigned long long) sbi->s_num_blocks);
 		goto out_brelse_bh2;
 	}
+	if (sbi->s_clustersize < 1 ||
+	    sbi->s_clustersize > OMFS_MAX_CLUSTER_SIZE) {
+		printk(KERN_ERR "omfs: cluster size out of range (%d)",
+			sbi->s_clustersize);
+		goto out_brelse_bh2;
+	}
 
 	ret = omfs_get_imap(sb);
 	if (ret)

diff --git a/trunk/fs/omfs/omfs_fs.h b/trunk/fs/omfs/omfs_fs.h
@@ -17,6 +17,7 @@
 #define OMFS_EXTENT_CONT 0x40
 #define OMFS_XOR_COUNT 19
 #define OMFS_MAX_BLOCK_SIZE 8192
+#define OMFS_MAX_CLUSTER_SIZE 8
 
 struct omfs_super_block {
 	char s_fill1[256];