Bläddra i källkod

Squashfs: fix failure to unlock pages on decompress error

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.peniaev@gmail.com>
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
Phillip Lougher 12 år sedan
förälder
incheckning
6d56540950
1 ändrade filer med 4 tillägg och 1 borttagningar
  1. 4 1
      fs/squashfs/file_direct.c

+ 4 - 1
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,
 		res = squashfs_read_cache(target_page, block, bsize, pages,
 								page);
 								page);
+		if (res < 0)
+			goto mark_errored;
+
 		goto out;
 		goto out;
 	}
 	}
 
 
@@ -119,7 +122,7 @@ mark_errored:
 	 * dealt with by the caller
 	 * dealt with by the caller
 	 */
 	 */
 	for (i = 0; i < pages; i++) {
 	for (i = 0; i < pages; i++) {
-		if (page[i] == target_page)
+		if (page[i] == NULL || page[i] == target_page)
 			continue;
 			continue;
 		flush_dcache_page(page[i]);
 		flush_dcache_page(page[i]);
 		SetPageError(page[i]);
 		SetPageError(page[i]);