From eecff14d436f364823908bc4f50be4703cbf874f Mon Sep 17 00:00:00 2001
From: Bob Copeland <me@bobcopeland.com>
Date: Tue, 6 Jul 2010 11:16:46 -0400
Subject: [PATCH] --- yaml --- r: 207739 b: refs/heads/master c:
 8800a044c71a128633cf3febaf4780531a991334 h: refs/heads/master i:   207737:
 0f4874f28618f8af2351d8c12329dad27bffb7cd   207735:
 9d17a0e0bbbeb3118308e084f87888dada790c6d v: v3

---
 [refs]                  | 2 +-
 trunk/fs/omfs/inode.c   | 6 ++++++
 trunk/fs/omfs/omfs_fs.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a88a29c9d8fe..c3291e9909db 100644
--- 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
index 0af5d0af9f32..579d33fedddd 100644
--- 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
index 12cca245d6e8..ee5e4327de92 100644
--- 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];