From patchwork Tue Nov 28 18:04:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 170903 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp4118316vqx; Tue, 28 Nov 2023 10:04:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/Y51ZEOlidGLmY1lFGq71YhHsQnrdQWYVkNbYbb6NypTWJW53z+RaGpI2bq5IPZMEXn+R X-Received: by 2002:a05:6870:1652:b0:1fa:28b9:ad32 with SMTP id c18-20020a056870165200b001fa28b9ad32mr5550068oae.29.1701194689341; Tue, 28 Nov 2023 10:04:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701194689; cv=none; d=google.com; s=arc-20160816; b=k9wQ2t59aGuWroWFkOLvXJ/L9Z0B0D31rQTuDrCBcU8kpF+bWNjbGei8T9MIu6q3Iq 6PedveIkdrBSDeTEwrlVG1SoLIC5YpgEZyF7SA5OebowgIhcq0Fm/3BOG6mtj76+lERt D1v1L7KHb8FAFskUQ7ynwyDL7Uc012nY9VkklbZi1l54oWhdKaQQJkAsjEAi1Cxt6dxg IcI9JmVzDaSv99cDYRIFMgAoyvJy3NbR1odkHR2qqxA/i3cvu57t5DNL3/iToNBILR62 GvQURHzvmNPrXkYImZX5CaPSQ0zfOyO3cAQ4L2i0S9C9z1kG2a8PR8+Wygz4zWOZJwK1 maXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dyYKu7wsOZjxHMWJ49uj0uKXGnLtDvpBRwoE0Vv7gFc=; fh=O78HJmpL5F5vEBJ7fj5QgOSmUhamGk6jv8eSOg+ntqY=; b=pv4rtaKO6Ul5LMZrmny1OxD6XPahrg9VFJDVlpkv4EG0C9umbU3vlgfwAAxG5+HdUY r2zVBZVLI4ZPBpPjr5Pp4uTG931AHuhzxqjdXe04A5/6boND4A/dcM6hvID4qxSvg7dO PgxWMb2ttNVowJW/HEJUqB7DTLbXOGISNUWMUluUPyd7E3ga2vtaftrH7fHRnZr7uHV5 CDUbd1sLDEeRiBBE4kkdM/Y+JIHoL6MEfk0onN5ZuukiULDz0ACtPzJEuYN6NCAwmVz8 Uzer38Cas8Il0Uc84Y1Mg4/emSq92SmKpw8/rpEVYZrCkyGw+iYCXiJChVmZJ29fcVlE AqNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id f4-20020a056830264400b006ce2e8de43dsi5287725otu.17.2023.11.28.10.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 10:04:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id A3F5880AD136; Tue, 28 Nov 2023 10:04:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345321AbjK1SEb (ORCPT + 99 others); Tue, 28 Nov 2023 13:04:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345415AbjK1SEa (ORCPT ); Tue, 28 Nov 2023 13:04:30 -0500 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64E62D63 for ; Tue, 28 Nov 2023 10:04:35 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=3;SR=0;TI=SMTPD_---0VxLRJJv_1701194672; Received: from e69b19392.et15sqa.tbsite.net(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VxLRJJv_1701194672) by smtp.aliyun-inc.com; Wed, 29 Nov 2023 02:04:33 +0800 From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH v2] erofs: fix memory leak on short-lived bounced pages Date: Wed, 29 Nov 2023 02:04:31 +0800 Message-Id: <20231128180431.4116991-1-hsiangkao@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231128175810.4105671-1-hsiangkao@linux.alibaba.com> References: <20231128175810.4105671-1-hsiangkao@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 28 Nov 2023 10:04:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783831601500555732 X-GMAIL-MSGID: 1783831922766105306 Both MicroLZMA and DEFLATE algorithms can use short-lived pages on demand for overlap 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'") Signed-off-by: Gao Xiang Reviewed-by: Yue Hu Reviewed-by: Chao Yu --- v2: - should be `be->compressed_pages`. fs/erofs/zdata.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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); }