From patchwork Fri Dec 30 13:28:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 37659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2894307wrt; Fri, 30 Dec 2022 05:37:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXsN+TFA5KdYAuzZFsz9I4QqR7s5schO2Q7WF1Av369e5Qo6PQyzGqFSQgVqkjYos4DrTJXu X-Received: by 2002:a17:906:fcc1:b0:7c0:e310:3191 with SMTP id qx1-20020a170906fcc100b007c0e3103191mr35614073ejb.11.1672407446688; Fri, 30 Dec 2022 05:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672407446; cv=none; d=google.com; s=arc-20160816; b=GVGHHzY3MrR3HD+rxvlAgPOzNAOYk9FnkSuxSY+eeo4TSemH4HqvDsfOyDjrxFttSL uYoJNcPnUUXgQANu/PUMx8MiNs2E8lzfUOHejc7/ZU0gMceDBkBRbAKt7xD/+kidSU4s l2FYHzupCwryckvBuRaQ6aoOuu3rPiVNBUUElRc1NIGClTAuGMGUum3vjTABJoZPsbta btwnGWm3zetMHpB1Kjpfywamz2mUBMwEaWOGGGzZg4/AGA6jANrB5AmGr4XJL4jWfOYM D+4ZokN2DCS6hQd22++/rtCbcfWYjjvjFyC0GXRQf9dFbZFGu5S7w4UUz7AOqaUz7JXC p9QA== 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=F5P212tNhU2MdBd8W83CXlcWw1RUzkk+/qbvM+EsgtE=; b=S9mQsXK5tb6TAfSoS2NKZrfkLMvMO9c5S11bhih5YDRvRg+2wDEGAcxfMYyBxq3tJf JpTPqlUMMN2GcAFfCyRoxtngwoWLwzugD5SjIc3V7CHNnVneug+Is9bEhBca6+5LoGsW SF8sO9sW8j018MxfWFKKBwl1ORpgxLjzzp8hd2paulh6iw4kQ9T9MSJ916+eVNYhtCIU lHphQ3GaQPYnTe5sYSQoQvq1VaPBTiFdv4E8LPP4YQnwHd70l3jNq9H3oPTLzWAExtP9 hN76BJlAuR3N332stP0KW686T81AyDnQwSuzZ8izKGP2t9RuzwHQlqgNLbeIIW0m0ik2 BjAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Q8Z9F1Td; 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 hd30-20020a170907969e00b007c31599251csi19400971ejc.590.2022.12.30.05.37.01; Fri, 30 Dec 2022 05:37:26 -0800 (PST) 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=Q8Z9F1Td; 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 S229895AbiL3N3L (ORCPT + 99 others); Fri, 30 Dec 2022 08:29:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbiL3N3J (ORCPT ); Fri, 30 Dec 2022 08:29:09 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A2EDFC3 for ; Fri, 30 Dec 2022 05:29:08 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id B9EB9CE184C for ; Fri, 30 Dec 2022 13:29:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCFDAC433EF; Fri, 30 Dec 2022 13:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672406944; bh=niN4//FFQLqT+lccFSrIwvGHtpHQO5j4UdQf+dAxTnM=; h=From:To:Cc:Subject:Date:From; b=Q8Z9F1TdYSn+DHTUxC0tV6CvgAHrJOkO5FS+1xoIU/hT+CkbagXRWd+nGcoQ7G+oY 1QABx5QNGJ4MojljBreW7J6SqybB4ua+Z7K/CoVuZXX9uC0n4P0zo+X55yDOKvUubL PHLVndJhdf+zQxLjSDF/wkNWw59kBNSelibr8zmXgfAVw08xcUNSyG/GDra/lIqWo/ SuMuf7ysAJlpw/vWb/dcZtItBAIsyY7oSAo8iebf5fgaHZN7thPjdHC3MX/i4cLQIL RbU4b4wNyOxl1QazZf9GFWYdu5inJ3fR5cYJa4YloshTyH+R5KZf9wDXHMRlAQuOdk UI6VDL+WnXmeg== 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 error path of f2fs_create_flush_cmd_control() Date: Fri, 30 Dec 2022 21:28:56 +0800 Message-Id: <20221230132856.4248-1-chao@kernel.org> X-Mailer: git-send-email 2.36.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?1753646311113841889?= X-GMAIL-MSGID: =?utf-8?q?1753646311113841889?= If kthread_run() fails in f2fs_create_flush_cmd_control(), it should not release SM_I(sbi)->fcc_info, otherwise, w/ below testcase, it will cause NULL pointer dereference when accessing SM_I(sbi)->fcc_info in f2fs_issue_flush(). - mount -o noflush_merge /dev/vda /mnt/f2fs - mount -o remount,flush_merge /dev/vda /mnt/f2fs -- kthread_run() fails - dd if=/dev/zero of=/mnt/f2fs/file bs=4k count=1 conv=fsync Signed-off-by: Chao Yu --- fs/f2fs/segment.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 2646575f43de..7b18e8c02f5d 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -663,8 +663,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) if (IS_ERR(fcc->f2fs_issue_flush)) { int err = PTR_ERR(fcc->f2fs_issue_flush); - kfree(fcc); - SM_I(sbi)->fcc_info = NULL; + fcc->f2fs_issue_flush = NULL; return err; }