Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp6115672rwi; Sun, 23 Oct 2022 18:36:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4S0QQgtkdwNGZvL7lUE5uiC3Jv3BM8g3aol/Eoi07HWiDdu0VEndGKDxGH80bQaHk14N9H X-Received: by 2002:a63:187:0:b0:43b:cf3c:c64d with SMTP id 129-20020a630187000000b0043bcf3cc64dmr26058830pgb.359.1666575389989; Sun, 23 Oct 2022 18:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666575389; cv=none; d=google.com; s=arc-20160816; b=hFROC+8UuMlGKelmb1rh8oS9IlYu6whZOdVJ11PdR2HbZE0jhGUdJ+6E5knbW7I4s/ N6wNjUNTttR3TTZNgaTB6DNSll4F4uvouWX0loCuzFk8e1hKchgwHbRKJ/rjIhP8Yc9u /aCsvVNDNd2DY/chZVR4jhDASPAzyoItUMSdoJ5e06HvIEMrfYEU999cya6QNhkAw8Uc xexechjOlTMCszVYZ+mc3i/OKF0ExwEiHHhMU0X2/i803kzazEANE0Ht5vWCh44vJ+pU eJf8Sz/miaQ7Chsw+VNNWINv5Qiro63TN/fzptdyZKQrcD3yCyjQ/n7QqpvjHw+X+bw8 oWHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:cc:to :subject; bh=jKMCSOmyyAO1LgmyVGWAd1c9Tr/Cq83ueiXbAo27RtQ=; b=N+UFE+XxJ+XNUdS1mfSOFaucq/AJFkdDe0LMZr2k+9OLaAfH+c43VeXxlYYT7ZEuum OoJTMCdYidgKGgZMxY7el2AKWd9vkqRfTdGJXtndhiLw9Oci6DcqA4lCeOYS6ugvOgms vv2/j7NQM1hhJne6i+rMu1kHeCE8l3q8s5XYfFxTrFtT/3feWvcYqmbmmuM+kdelJjKI 4exQRb9zjDBUyEIkkNYs+0gtkbpKEizREubYs3bjLw87ctL74Hc7pIq439e/ja3CVo9O zG7Mnp+fqMlTylDyeu/OUpyxBr/7RoA5qkhzxy+JOPmw7m3mDhbjpYkPtw45D0ZR9X7x 3KpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n32-20020a635920000000b0043954dec8c1si35358023pgb.615.2022.10.23.18.36.18; Sun, 23 Oct 2022 18:36:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbiJXBbw (ORCPT + 99 others); Sun, 23 Oct 2022 21:31:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbiJXBbv (ORCPT ); Sun, 23 Oct 2022 21:31:51 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FF9E6B16B for ; Sun, 23 Oct 2022 18:31:50 -0700 (PDT) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Mwcqk2vXkz15M1S; Mon, 24 Oct 2022 09:26:58 +0800 (CST) Received: from kwepemm600013.china.huawei.com (7.193.23.68) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 24 Oct 2022 09:31:48 +0800 Received: from [10.174.178.46] (10.174.178.46) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 24 Oct 2022 09:31:47 +0800 Subject: Re: [PATCH] ubifs: Fix memory leak in alloc_wbufs() To: Li Zetao , , , CC: , , References: <20221022115211.1969429-1-lizetao1@huawei.com> From: Zhihao Cheng Message-ID: Date: Mon, 24 Oct 2022 09:31:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20221022115211.1969429-1-lizetao1@huawei.com> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.178.46] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS 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 ?? 2022/10/22 19:52, Li Zetao ะด??: > kmemleak reported a sequence of memory leaks, and show them as following: > > unreferenced object 0xffff8881575f8400 (size 1024): > comm "mount", pid 19625, jiffies 4297119604 (age 20.383s) > hex dump (first 32 bytes): > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > backtrace: > [] __kmalloc+0x4d/0x150 > [] ubifs_mount+0x307b/0x7170 [ubifs] > [] legacy_get_tree+0xed/0x1d0 > [] vfs_get_tree+0x7d/0x230 > [] path_mount+0xdd4/0x17b0 > [] __x64_sys_mount+0x1fa/0x270 > [] do_syscall_64+0x35/0x80 > [] entry_SYSCALL_64_after_hwframe+0x46/0xb0 > > unreferenced object 0xffff8881798a6e00 (size 512): > comm "mount", pid 19677, jiffies 4297121912 (age 37.816s) > hex dump (first 32 bytes): > 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk > 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk > backtrace: > [] __kmalloc+0x4d/0x150 > [] ubifs_wbuf_init+0x52/0x480 [ubifs] > [] ubifs_mount+0x31f5/0x7170 [ubifs] > [] legacy_get_tree+0xed/0x1d0 > [] vfs_get_tree+0x7d/0x230 > [] path_mount+0xdd4/0x17b0 > [] __x64_sys_mount+0x1fa/0x270 > [] do_syscall_64+0x35/0x80 > [] entry_SYSCALL_64_after_hwframe+0x46/0xb0 > > The problem is that the ubifs_wbuf_init() returns an error in the > loop which in the alloc_wbufs(), then the wbuf->buf and wbuf->inodes > that were successfully alloced before are not freed. > > Fix it by adding error hanging path in alloc_wbufs() which frees > the memory alloced before when ubifs_wbuf_init() returns an error. > > Fixes: 1e51764a3c2a ("UBIFS: add new flash file system") > Signed-off-by: Li Zetao > --- > fs/ubifs/super.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) Reviewed-by: Zhihao Cheng