The patch titled
cramfs: propagate uncompression errors
has been added to the -mm tree. Its filename is
cramfs-propagate-uncompression-errors.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cramfs: propagate uncompression errors
From: David VomLehn <dvomlehn@xxxxxxxxx>
If cramfs_uncompress_block() detects an error uncompressing it will return
a zero value. This patch checks the return value and propagates the error
back up to the block layer.
Signed-off-by: David VomLehn <dvomlehn@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/cramfs/inode.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff -puN fs/cramfs/inode.c~cramfs-propagate-uncompression-errors fs/cramfs/inode.c
--- a/fs/cramfs/inode.c~cramfs-propagate-uncompression-errors
+++ a/fs/cramfs/inode.c
@@ -488,12 +488,19 @@ static int cramfs_readpage(struct file *
compr_len);
mutex_unlock(&read_mutex);
}
- } else
- pgdata = kmap(page);
- memset(pgdata + bytes_filled, 0, PAGE_CACHE_SIZE - bytes_filled);
- kunmap(page);
- flush_dcache_page(page);
- SetPageUptodate(page);
+
+ if (bytes_filled == 0) {
+ /* Decompression error */
+ ClearPageUptodate(page);
+ SetPageError(page);
+ } else {
+ memset(pgdata + bytes_filled, 0,
+ PAGE_CACHE_SIZE - bytes_filled);
+ flush_dcache_page(page);
+ SetPageUptodate(page);
+ }
+ kunmap(page);
+ }
unlock_page(page);
return 0;
}
_
Patches currently in -mm which might be from dvomlehn@xxxxxxxxx are
cramfs-propagate-uncompression-errors.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
