Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d565409 authored by Phillip Lougher's avatar Phillip Lougher
Browse files

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: default avatarRoman Peniaev <r.peniaev@gmail.com>
Signed-off-by: default avatarPhillip Lougher <phillip@squashfs.org.uk>
parent ed4f381e

fs/squashfs/file_direct.c

+4 −1
Original line number Diff line number Diff line
@@ -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]);