[PATCH] Squashfs: fix failure to unlock pages on decompress error

2013-11-23 Thread Phillip Lougher 
Direct decompression into the page cache.  If we fall back
to using an intermediate buffer (because we cannot grab all the
page cache pages) and we get a decompress fail, we forgot to
release the pages.

Reported-by: Roman Peniaev 
Signed-off-by: Phillip Lougher 
---
 fs/squashfs/file_direct.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c
index 2943b2b..62a0de6 100644
--- a/fs/squashfs/file_direct.c
+++ b/fs/squashfs/file_direct.c
@@ -84,6 +84,9 @@ int squashfs_readpage_block(struct page *target_page, u64 
block, int bsize)
 */
res = squashfs_read_cache(target_page, block, bsize, pages,
page);
+   if (res < 0)
+   goto mark_errored;
+
goto out;
}
 
@@ -119,7 +122,7 @@ mark_errored:
 * dealt with by the caller
 */
for (i = 0; i < pages; i++) {
-   if (page[i] == target_page)
+   if (page[i] == NULL || page[i] == target_page)
continue;
flush_dcache_page(page[i]);
SetPageError(page[i]);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Squashfs: fix failure to unlock pages on decompress error

2013-11-23 Thread Phillip Lougher 
Direct decompression into the page cache.  If we fall back
to using an intermediate buffer (because we cannot grab all the
page cache pages) and we get a decompress fail, we forgot to
release the pages.

Reported-by: Roman Peniaev r.peni...@gmail.com
Signed-off-by: Phillip Lougher phil...@squashfs.org.uk
---
 fs/squashfs/file_direct.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/squashfs/file_direct.c b/fs/squashfs/file_direct.c
index 2943b2b..62a0de6 100644
--- a/fs/squashfs/file_direct.c
+++ b/fs/squashfs/file_direct.c
@@ -84,6 +84,9 @@ int squashfs_readpage_block(struct page *target_page, u64 
block, int bsize)
 */
res = squashfs_read_cache(target_page, block, bsize, pages,
page);
+   if (res  0)
+   goto mark_errored;
+
goto out;
}
 
@@ -119,7 +122,7 @@ mark_errored:
 * dealt with by the caller
 */
for (i = 0; i  pages; i++) {
-   if (page[i] == target_page)
+   if (page[i] == NULL || page[i] == target_page)
continue;
flush_dcache_page(page[i]);
SetPageError(page[i]);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/