Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4032971rdh; Tue, 28 Nov 2023 09:59:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEByd9ITjqf1FW8ktjsvVUKVV1L1MuvCVkfwxewp1ebzSZrx3/+S05bupLPl7YGnOV6Kbka X-Received: by 2002:a17:902:d303:b0:1cc:5691:5113 with SMTP id b3-20020a170902d30300b001cc56915113mr17681475plc.26.1701194384065; Tue, 28 Nov 2023 09:59:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701194384; cv=none; d=google.com; s=arc-20160816; b=SzIhTrF7GH/H1gfFzq3+xK869aFjs3Bonon5EK+uaTmVlhL49roYncONWCeCUvqmJB TTIDlH8K7UwqVhov2sOoWTmgBndDUL2u+jYp43N6h4S/RZZcgbdTTEsxmMvDYUEDIOE1 hYz0lW0TtXH7F6NS7QpAPfnQ48IT8Tr3pBt6hsBp2zw2QedKH/m4Gp+3i9Hz9OWyiMp9 bkckWnLgxTMFQjUbnkI24t1w+A5QWbram2ctdPNzEYdnCxC7bHN6mSykuUUzFwzIiuSH oWBcFMIM+mRl8Z4gUe1qAUfXuG4q6uLuLY5T3n7xup53hGbfQalADmkialxwZaST8XvO HGZQ== 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 :message-id:date:subject:cc:to:from; bh=z08PElYD0Rp2NEWQqrqW4pZGOXMU7JGfnmzJS0/l6Gk=; fh=O78HJmpL5F5vEBJ7fj5QgOSmUhamGk6jv8eSOg+ntqY=; b=C70VD0icaQz10o+p8fDtCUhAUHYqK/I8vw6obH84mi3k1FnxCcrBJEScpAvuymCWHa vyGMcrt0eXvOmar6GoR2FkEKuvreRg0pUVE37uT/425w9gLAPlUmyM0A+BbDKZec5VPF O7MbunzEpgjluIplAf642OrrXAETh6VsARQN6YAlk2Rb/vjm5qhpl4JRQShLv0mWjMkW gJlicNdGzTREOPZarLFwVezazW3vtNWcqSUqjC7W0VO9pgX/+uihvyxJdpBLAwP093gv p/c1X6cXBwlMgA+QkSnIpGl+daCNj5yEu02o8kYOUfthh/P0kTHqd/PvMPUAyuX0tUdM JQ6Q== 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:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x5-20020a1709028ec500b001cc1a3e42d8si11510538plo.324.2023.11.28.09.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 09:59:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id AD8CA80909D0; Tue, 28 Nov 2023 09:59:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346665AbjK1R7c (ORCPT + 99 others); Tue, 28 Nov 2023 12:59:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346569AbjK1R7S (ORCPT ); Tue, 28 Nov 2023 12:59:18 -0500 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 644832129 for ; Tue, 28 Nov 2023 09:58:28 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046060;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=3;SR=0;TI=SMTPD_---0VxLTYBk_1701194300; Received: from e69b19392.et15sqa.tbsite.net(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VxLTYBk_1701194300) by smtp.aliyun-inc.com; Wed, 29 Nov 2023 01:58:26 +0800 From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH] erofs: fix memory leak on short-lived bounced pages Date: Wed, 29 Nov 2023 01:58:10 +0800 Message-Id: <20231128175810.4105671-1-hsiangkao@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 28 Nov 2023 09:59:42 -0800 (PST) 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->decompressed_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 --- 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..e5e44f926692 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->decompressed_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); } -- 2.39.3