From patchwork Mon Oct 24 11:29:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8595 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp419398wru; Mon, 24 Oct 2022 05:16:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69i9fY1NH5zjzhez71LXSpZh3q6ozj8s1DndcwIVLp89KxAeBULohLlEAsFkTGVZA0gBdp X-Received: by 2002:a05:6402:2994:b0:453:4c5c:d31c with SMTP id eq20-20020a056402299400b004534c5cd31cmr31044883edb.412.1666613773839; Mon, 24 Oct 2022 05:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613773; cv=none; d=google.com; s=arc-20160816; b=XqEOidHRVEH5ECA/emix8YOIAchu9b/hEQoNL34CU28MhA79VF8e3EewvSD20ifmRu jWRYKDNw00cdxcGHqmlluaM1PmObtMwJBNNrNLN41rW1HgPBKBomBQgNguXlUtzUNG82 fk+XmH1PR43Kf8IRy3/oBREfBNtwQ1AARD1IOfZktYvEMKMFpVGZlI+6epif7yhSejKe QxqRgB5XjFHnR5dqUlLC7DX09pxjekkIFVY58ISx2atO+VrTrYs/r2S9MM+aNly4Y1KS 7tHHcdZAef1Cumg/qzoyaR3yE6TcoIRuLyz+2+V4IObHi3D5uy7L15a31WvdWJZ1BOAw 629Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lyiAZO3SAm8PCa0UBN8nZxoF4SXWKIJzgi5/pFVwS4k=; b=UkRKj/ZVnXYXGosAuvr2mo36/mraVStkpM3JDcfGvAYRpDESpiC69/nezsvNj6C1Qx DUDKlyg9QUj06WSn2mUaLg6up3ZR1WFZlku9hbSwLoKJ7NS6R6TFAKM9TFKVF3u8GdKU rCZbM6z48UnMaz7PzFmxtScXLt3DVtdBGiPU1VVEgjVvTVx6g3sEkRs9JOXfhMydb/1n KDmyTpTEWm0xUVAuIKXTx2wI6OQ22rX5q0mqqMG6rb/8WhAACnHFPTOLeTyxpH77eRgY uUHHQH+tVc/UWyb8dvog970kqwVoapDEgzkxOeSpoG506Bk8XUdTRWxaf5ZSNDPOpNWD +MWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WWr/U3+X"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y9-20020a056402270900b0045bc5ea5334si17094581edd.115.2022.10.24.05.15.48; Mon, 24 Oct 2022 05:16:13 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WWr/U3+X"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232663AbiJXMGb (ORCPT + 99 others); Mon, 24 Oct 2022 08:06:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232822AbiJXMEX (ORCPT ); Mon, 24 Oct 2022 08:04:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 680C2645EC; Mon, 24 Oct 2022 04:50:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 24DA06129A; Mon, 24 Oct 2022 11:48:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3551FC433C1; Mon, 24 Oct 2022 11:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612096; bh=TUiPWq/VBBBaKB6AnHuiVoU+P31Rh8GRZ3nIWlDm40E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWr/U3+XWViTayeBraGEKYB6+jSd/rpHXjtysnOYkgJEUDXa5IiSE0wqpJFkXKesC MXirQg6u7fKZoONnzNE93Owr4V2xODUJhcPgVUYg0PXJpQPUdP8PPP3zyWbNSb7SdE nGx5JUCqqMWmcdeHjss9UewWRtz513Xwd6PURZ0s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryusuke Konishi , syzbot+7381dc4ad60658ca4c05@syzkaller.appspotmail.com, Andrew Morton Subject: [PATCH 4.14 037/210] nilfs2: fix leak of nilfs_root in case of writer thread creation failure Date: Mon, 24 Oct 2022 13:29:14 +0200 Message-Id: <20221024112958.183474754@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747571204745892064?= X-GMAIL-MSGID: =?utf-8?q?1747571204745892064?= From: Ryusuke Konishi commit d0d51a97063db4704a5ef6bc978dddab1636a306 upstream. If nilfs_attach_log_writer() failed to create a log writer thread, it frees a data structure of the log writer without any cleanup. After commit e912a5b66837 ("nilfs2: use root object to get ifile"), this causes a leak of struct nilfs_root, which started to leak an ifile metadata inode and a kobject on that struct. In addition, if the kernel is booted with panic_on_warn, the above ifile metadata inode leak will cause the following panic when the nilfs2 kernel module is removed: kmem_cache_destroy nilfs2_inode_cache: Slab cache still has objects when called from nilfs_destroy_cachep+0x16/0x3a [nilfs2] WARNING: CPU: 8 PID: 1464 at mm/slab_common.c:494 kmem_cache_destroy+0x138/0x140 ... RIP: 0010:kmem_cache_destroy+0x138/0x140 Code: 00 20 00 00 e8 a9 55 d8 ff e9 76 ff ff ff 48 8b 53 60 48 c7 c6 20 70 65 86 48 c7 c7 d8 69 9c 86 48 8b 4c 24 28 e8 ef 71 c7 00 <0f> 0b e9 53 ff ff ff c3 48 81 ff ff 0f 00 00 77 03 31 c0 c3 53 48 ... Call Trace: ? nilfs_palloc_freev.cold.24+0x58/0x58 [nilfs2] nilfs_destroy_cachep+0x16/0x3a [nilfs2] exit_nilfs_fs+0xa/0x1b [nilfs2] __x64_sys_delete_module+0x1d9/0x3a0 ? __sanitizer_cov_trace_pc+0x1a/0x50 ? syscall_trace_enter.isra.19+0x119/0x190 do_syscall_64+0x34/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd ... Kernel panic - not syncing: panic_on_warn set ... This patch fixes these issues by calling nilfs_detach_log_writer() cleanup function if spawning the log writer thread fails. Link: https://lkml.kernel.org/r/20221007085226.57667-1-konishi.ryusuke@gmail.com Fixes: e912a5b66837 ("nilfs2: use root object to get ifile") Signed-off-by: Ryusuke Konishi Reported-by: syzbot+7381dc4ad60658ca4c05@syzkaller.appspotmail.com Tested-by: Ryusuke Konishi Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/nilfs2/segment.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2797,10 +2797,9 @@ int nilfs_attach_log_writer(struct super inode_attach_wb(nilfs->ns_bdev->bd_inode, NULL); err = nilfs_segctor_start_thread(nilfs->ns_writer); - if (err) { - kfree(nilfs->ns_writer); - nilfs->ns_writer = NULL; - } + if (unlikely(err)) + nilfs_detach_log_writer(sb); + return err; }