From patchwork Thu Oct 13 15:56:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 2084 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp352610wrs; Thu, 13 Oct 2022 09:00:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4LqbGd4/r/+MlS9nS3nWnameG7D/nyQ6InWFPCfKqqZgGVHsP1k3IQMaPIA/WXF1vsazwS X-Received: by 2002:a63:4e5a:0:b0:438:9513:da55 with SMTP id o26-20020a634e5a000000b004389513da55mr448357pgl.381.1665676828339; Thu, 13 Oct 2022 09:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665676828; cv=none; d=google.com; s=arc-20160816; b=yRtbNvOomAL6BaSqEfBvT/qRh7lyOy8dryCwUHWaN0jcxueMzaO6FoOIXErTSjW+T3 EwqOnnAzMPRbetZiwFI93cyF650k0O2ABR93Q9nwqwbknLoO5b6DWLrQRfv52jJ6NQl4 ZatPnX7BL4K7s80XiB/kyu2pBkXGNCmKcxrJ12Dhr4PoPL6b+T1H2Q/zyhwvhgwDNMPb TXLmt4RuX+91j7o52h2YjOHX4VBhUzMlYJRiFAzeFM0KtNOyG7D/C0biUo+f06+9SFbY yLx/wEV6py8EMKzyOnIiK6yaksVyVVX8DtXklovdKxkFxmMwqKawAALHFZGIdc6zejkQ KJXQ== 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:dkim-signature; bh=CZ2Gdyp0QFb4P6ZB90hP59gfkhsGjsGM8QJk9LFKIB4=; b=dYRjEYBkCcb2UYEywoueiXFy9WJpAnjKet4Npdoq95otAvARzIHmzNaTGRcudmzQMf KZOcAE8Ccie3UYl/EMuS0qlAybgHO2+Snwu+U3exv32gwUREYkM64Ig8+fgO7LYAHdRO YC5ZlGeuqH2zOIMM3coJ55dfwKTXivihj6+2zvIvQ/FbrKk+aEl+VVy143148Czk/rBB t1922Tl9ZNpCzmuJxu4oLF1W97vLiBYAMtz0klLufnZaxQUowfFHWP/duIPY3RC+5B9f DpKXOy7Z9XnIvGhKRb2SPpjGP4BxBlI0q3s39RU5jLq1d37RZgJEsyEucqxbKdyptK0F aIbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nsVW+GFj; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g13-20020a17090a640d00b0020291c96b13si5255589pjj.121.2022.10.13.09.00.13; Thu, 13 Oct 2022 09:00:28 -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=@kernel.org header.s=k20201202 header.b=nsVW+GFj; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230044AbiJMP5D (ORCPT + 99 others); Thu, 13 Oct 2022 11:57:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229985AbiJMP4r (ORCPT ); Thu, 13 Oct 2022 11:56:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B1E9F5CED for ; Thu, 13 Oct 2022 08:56:39 -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 ams.source.kernel.org (Postfix) with ESMTPS id A4CBBB81D51 for ; Thu, 13 Oct 2022 15:56:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F364C433B5; Thu, 13 Oct 2022 15:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665676596; bh=GWAsMCzrsIUK4JqlUZTcZflB2YUEVAu+pDYdJDx8/Tw=; h=From:To:Cc:Subject:Date:From; b=nsVW+GFj8U/jt+iF+40/ZOlxP4jVxowrnSiIFCF/n8o+pRVcTJE296rppf5ti3Zbg mA+Goa8VSohxc4Cilcu5J1XyQVJE+c5IKLMoFL/7l/HNTUnhJ3zUL6vt3mpKu+kd6Y HsoPf3ttdMBM1gmjYllxUaw6fyQIC/F9XL5lp4ZQPwYaEtCtBtNsTjuUlw1vIkmxvu 9aZLKVwedcAPj7EAUwWaaNavarac6Hx/iQIxqigVsa7hfm2nsF0mCkUis48+HUiltN 73yAoFt+RZi3beqyArg9bTzeJ1Y1GJAMF/NQttBW5Gkw1GX/HP5K51mEK4icCD1q3r uysUaXPS0G4fw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: fix to invalidate dcc->f2fs_issue_discard in error path Date: Thu, 13 Oct 2022 23:56:28 +0800 Message-Id: <20221013155628.434671-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 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?1746588745778554933?= X-GMAIL-MSGID: =?utf-8?q?1746588745778554933?= Otherwise, latter f2fs_stop_discard_thread() may access invalid dcc->f2fs_issue_discard. Signed-off-by: Chao Yu --- fs/f2fs/segment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 460048f3c850..cf5f534aa887 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2026,8 +2026,10 @@ int f2fs_start_discard_thread(struct f2fs_sb_info *sbi) dcc->f2fs_issue_discard = kthread_run(issue_discard_thread, sbi, "f2fs_discard-%u:%u", MAJOR(dev), MINOR(dev)); - if (IS_ERR(dcc->f2fs_issue_discard)) + if (IS_ERR(dcc->f2fs_issue_discard)) { err = PTR_ERR(dcc->f2fs_issue_discard); + dcc->f2fs_issue_discard = NULL; + } return err; }