From patchwork Thu Oct 13 17:51:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405461wrs; Thu, 13 Oct 2022 10:57:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6nN1ou/KyPiH10ROTZB+MCTQ7qSI5/k5FI19rnw3t5kGjWUc1x3v71lqzgz1rlDb2zALDl X-Received: by 2002:a05:6402:520d:b0:45a:31cb:f5bd with SMTP id s13-20020a056402520d00b0045a31cbf5bdmr837728edd.119.1665683874914; Thu, 13 Oct 2022 10:57:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683874; cv=none; d=google.com; s=arc-20160816; b=HAKJ3wz0iAk5Df3yDvTfHcuB2dX+dKfWMFSZZMyUX5mgl4hgp1889RtnwAMuR8MG/N uVLo6cNcUQW11uE4Ur7wzLYSQmAUkBMZfW/kSVRgTfAfDVu2QvBXz2auXksD71KuXWHw Q0I65O4XqUYZbv95BzAdMIDpTr34XGeYCyQmEWkWDtU0AWNArmsdhslvOlF4IfagBE0n vlqPkGvp2ohxLIk6T37zLWXZKyDcc7ow0IG5bRJLsQt6Bs4MhEz7wctCK+vqQUQWPbtT JiDh8gzOeaxvsxRtJgHYmhEzl5AYTpiw0AktVKNijwNDxjq6XFwlIVUAZmcdw8sevaPE 477w== 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=6hqlh/vA3UbsFtMtZuO0GYhwv4YSZDIfpwaEm44HKaA=; b=ps31u3TGrd/7qEDoD//8qkaQvHR6WeXTcjMQ/A4kbXzUYUbeD6A+0daQiYr0Jr5qzE e0cDGl2nBbaY/XEOYflhXow5cGyLmxlZghKl0enLGfPXAdnOmrWQ5rKmNy0VE4bOf5aF 1wq9z8AfOC33G6hV9ZvU9uBO7VpfNGUEcvYJWytD4ydaE+3RiiIOqjCAkkdiSpFDNzFd tQcE4nzzen7rMR+g4hoUT9btHGHM0GGwMG7FzF0UzDTApTHD9hMVMH7dG7UsGZoWXVrf /1xZ0eZFfD9jw7jvHjkECVYxL4difgemfuHxWtY88ih68QMayBfkAzIiwW8qUDln8nXl qcaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Dv5xh/B/"; 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 cs9-20020a170906dc8900b0078d4b88f122si232334ejc.950.2022.10.13.10.57.28; Thu, 13 Oct 2022 10:57:54 -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="Dv5xh/B/"; 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 S230124AbiJMR47 (ORCPT + 99 others); Thu, 13 Oct 2022 13:56:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230140AbiJMR4U (ORCPT ); Thu, 13 Oct 2022 13:56:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B16941CFE4; Thu, 13 Oct 2022 10:54:51 -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 AAADE618F4; Thu, 13 Oct 2022 17:54:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD48DC433C1; Thu, 13 Oct 2022 17:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683684; bh=ixGC6c5QNd1hYNF90xkJ46CBLj9g67afRa4MeEm1zIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dv5xh/B/E49LzbNx/Hh145Bj6gcfTsD8s+I27EUbcb84CMfuY0VgOrRznaKomMojb IVxe0jCwSbnUqtNle20HR1wWSMhpGsv0uIUm/qayw0swmylbG9HYNBZjo/nywF9utX u7eYnMbgXR7/lRaaTz9YdQwvp7lNMJlHTsruAut4= 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 5.10 03/54] nilfs2: fix leak of nilfs_root in case of writer thread creation failure Date: Thu, 13 Oct 2022 19:51:57 +0200 Message-Id: <20221013175147.429141425@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1746596135252938389?= X-GMAIL-MSGID: =?utf-8?q?1746596135252938389?= 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 @@ -2791,10 +2791,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; }