summary refs log tree commit diff
path: root/fs/omfs/inode.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2010-07-06 11:16:46 -0400
committerBob Copeland <me@bobcopeland.com>2010-07-10 14:38:11 -0400
commit8800a044c71a128633cf3febaf4780531a991334 (patch)
treeb736cdc086d86f27e1b52efa96f2a3f15fe1d443 /fs/omfs/inode.c
parent9442e54f433eff9b6fbd0836611df4c1919df370 (diff)
downloadlinux-8800a044c71a128633cf3febaf4780531a991334.tar.gz
omfs: sanity check cluster size
A corrupt filesystem could have a bad cluster size; this could result in
the filesystem allocating too much space for files if too large, or
getting stuck in omfs_allocate_block if too small.  The proper range is
1-8 blocks.

Reported-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Diffstat (limited to 'fs/omfs/inode.c')
-rw-r--r--fs/omfs/inode.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 0af5d0af9f32..579d33fedddd 100644
--- a/fs/omfs/inode.c
+++ b/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)