Patch "erofs: fix memory leak on short-lived bounced pages" has been added to the 6.7-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    erofs: fix memory leak on short-lived bounced pages

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     erofs-fix-memory-leak-on-short-lived-bounced-pages.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit b246611b226a3c3631e7c9d581fe137fbff55cbe
Author: Gao Xiang <xiang@xxxxxxxxxx>
Date:   Wed Nov 29 02:04:31 2023 +0800

    erofs: fix memory leak on short-lived bounced pages
    
    [ Upstream commit 93d6fda7f926451a0fa1121b9558d75ca47e861e ]
    
    Both MicroLZMA and DEFLATE algorithms can use short-lived pages on
    demand for the overlapped inplace I/O decompression.
    
    However, those short-lived pages are actually added to
    `be->compressed_pages`.  Thus, it should be checked instead of
    `pcl->compressed_bvecs`.
    
    The LZ4 algorithm doesn't work like this, so it won't be impacted.
    
    Fixes: 67139e36d970 ("erofs: introduce `z_erofs_parse_in_bvecs'")
    Reviewed-by: Yue Hu <huyue2@xxxxxxxxxxx>
    Reviewed-by: Chao Yu <chao@xxxxxxxxxx>
    Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20231128180431.4116991-1-hsiangkao@xxxxxxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index a7e6847f6f8f..a33cd6757f98 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1309,12 +1309,11 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,
 		put_page(page);
 	} else {
 		for (i = 0; i < pclusterpages; ++i) {
-			page = pcl->compressed_bvecs[i].page;
+			/* consider shortlived pages added when decompressing */
+			page = be->compressed_pages[i];
 
 			if (erofs_page_is_managed(sbi, page))
 				continue;
-
-			/* recycle all individual short-lived pages */
 			(void)z_erofs_put_shortlivedpage(be->pagepool, page);
 			WRITE_ONCE(pcl->compressed_bvecs[i].page, NULL);
 		}




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux