From 7352c8b4fdb454378dcb3001b096c1c746580071 Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.org.uk>
Date: Wed, 6 Dec 2006 20:37:20 -0800
Subject: [PATCH] --- yaml --- r: 42832 b: refs/heads/master c:
 8bb0269160df2a60764013994d0bc5165406cf4a h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cramfs/inode.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99d79902af19..8af2c146d6f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e591bbc0d563e12f5a260fbbca0df7d5810910e
+refs/heads/master: 8bb0269160df2a60764013994d0bc5165406cf4a
diff --git a/trunk/fs/cramfs/inode.c b/trunk/fs/cramfs/inode.c
index a624c3ec8189..0509cedd415c 100644
--- a/trunk/fs/cramfs/inode.c
+++ b/trunk/fs/cramfs/inode.c
@@ -481,6 +481,8 @@ static int cramfs_readpage(struct file *file, struct page * page)
 		pgdata = kmap(page);
 		if (compr_len == 0)
 			; /* hole */
+		else if (compr_len > (PAGE_CACHE_SIZE << 1))
+			printk(KERN_ERR "cramfs: bad compressed blocksize %u\n", compr_len);
 		else {
 			mutex_lock(&read_mutex);
 			bytes_filled = cramfs_uncompress_block(pgdata,