git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
fs
/
cramfs
/
inode.c
diff --git
a/fs/cramfs/inode.c
b/fs/cramfs/inode.c
index
abc60b7
..
0e2294c
100644
(file)
--- a/
fs/cramfs/inode.c
+++ b/
fs/cramfs/inode.c
@@
-482,6
+482,8
@@
static int cramfs_readpage(struct file *file, struct page * page)
pgdata = kmap(page);
if (compr_len == 0)
; /* hole */
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,
else {
mutex_lock(&read_mutex);
bytes_filled = cramfs_uncompress_block(pgdata,