Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3416033rwa; Tue, 23 Aug 2022 04:32:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4DyVao+6Ah2zinj/7DeZER3YkMy5cUNqpzd8QsjNKAzPvzWk9Pc7kwBLGJMiON2s77i3ue X-Received: by 2002:a17:907:75dc:b0:730:9c68:9a2e with SMTP id jl28-20020a17090775dc00b007309c689a2emr16801608ejc.22.1661254243108; Tue, 23 Aug 2022 04:30:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254243; cv=none; d=google.com; s=arc-20160816; b=WCwFO2rmqdL0YanSBHDYQ2wwPNUWmeRKO4BnwnBX0sZaIDHnob3mZJOr+ZwRM24qJ5 NbWyJMQ1jHB+fgFPUPN1P+bdSi6v5zlnb1Ozq/J4qT54HpLaJTHVwEYT9lUZFcB5MJig Gybqlx5yB1E63+eflgViC16VHxOIMYtaDYQiI4T1NgnKLa2QEPSOYHKd660jEUL1GA7M gN8Xn5eNIdhwWO6LiQKP4Jx5NUJMYZTh55lbNMLu4YibtWM7LrbHomd/gvYjWMaJQzVl ce9I/PJKJ9GoHJFVRY+vvhT7b0/97cDJfOE11mha42WlEZgLAEJzc8PGwBBIXHVemUn/ MNvg== 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=O3FO1eb5XPOS7NluvrGvZKZeViJDVosrfhQ9URAh3BI=; b=p/2qBQO73z18bbOIFhelV2Y9E6mpPw9qa6mTyXGmGIBMbyhgHIixovHcQ7JEMKx6Nk +9WGngRNFq4i7QC1JB0Btq8YlPz7rRxrt7KtJrVgfz7LdKxMQTUgGSmKmjeCYdog0Whk onWbwirSIYf7CebwFR+GZLvjqPCDIajNwKGofKA60/e+qawkJiWDNKtcbw0ToUiW5zgO 4l3Tl8qiSMA8Vxvf4vBk8HEDpuRCz8B28N2yxAULHbDdpV9cXUdlivIJ6wgEH2uDwPrP KZMgRjUBe5nSd7G2R71iMGdq5mdZCxyhqleP+U8ob8j8O8NXl3C470xiYVKtRZhz9rFA 3oQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QIAL1OT4; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e16-20020a056402149000b0043d2b797e58si1627784edv.497.2022.08.23.04.30.17; Tue, 23 Aug 2022 04:30:43 -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=QIAL1OT4; 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 S244118AbiHWLHH (ORCPT + 99 others); Tue, 23 Aug 2022 07:07:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242707AbiHWLEv (ORCPT ); Tue, 23 Aug 2022 07:04:51 -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 11854B3B2D; Tue, 23 Aug 2022 02:15:22 -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 6D343B81B1F; Tue, 23 Aug 2022 09:15:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FBFAC433C1; Tue, 23 Aug 2022 09:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246114; bh=KLIBEcsh5152wFckpsV3ZF+ehgzB/McM0dh95FMn3KU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QIAL1OT4Osf7hFAc7imtCnBnhDJ/2QQW615uKqP0KFfrpi559jA7CilCWKqpcuVqc SwyC4JGl7isMGtGnxup7dHpUgjFhmhSD4H+QTZ/TR71ckthy68czxo+ZCyiRfJ3BJD RQXWneh+wfkgjmHjH4kD2bK9MidhWhNRd1KVfd8s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dipanjan Das , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 279/287] f2fs: fix to avoid use f2fs_bug_on() in f2fs_new_node_page() Date: Tue, 23 Aug 2022 10:27:28 +0200 Message-Id: <20220823080110.840326500@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080100.268827165@linuxfoundation.org> References: <20220823080100.268827165@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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,T_SCC_BODY_TEXT_LINE 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 From: Chao Yu [ Upstream commit 141170b759e03958f296033bb7001be62d1d363b ] As Dipanjan Das reported, syzkaller found a f2fs bug as below: RIP: 0010:f2fs_new_node_page+0x19ac/0x1fc0 fs/f2fs/node.c:1295 Call Trace: write_all_xattrs fs/f2fs/xattr.c:487 [inline] __f2fs_setxattr+0xe76/0x2e10 fs/f2fs/xattr.c:743 f2fs_setxattr+0x233/0xab0 fs/f2fs/xattr.c:790 f2fs_xattr_generic_set+0x133/0x170 fs/f2fs/xattr.c:86 __vfs_setxattr+0x115/0x180 fs/xattr.c:182 __vfs_setxattr_noperm+0x125/0x5f0 fs/xattr.c:216 __vfs_setxattr_locked+0x1cf/0x260 fs/xattr.c:277 vfs_setxattr+0x13f/0x330 fs/xattr.c:303 setxattr+0x146/0x160 fs/xattr.c:611 path_setxattr+0x1a7/0x1d0 fs/xattr.c:630 __do_sys_lsetxattr fs/xattr.c:653 [inline] __se_sys_lsetxattr fs/xattr.c:649 [inline] __x64_sys_lsetxattr+0xbd/0x150 fs/xattr.c:649 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 NAT entry and nat bitmap can be inconsistent, e.g. one nid is free in nat bitmap, and blkaddr in its NAT entry is not NULL_ADDR, it may trigger BUG_ON() in f2fs_new_node_page(), fix it. Reported-by: Dipanjan Das Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/node.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index ff3f97ba1a55..2c28f488ac2f 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1232,7 +1232,11 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs) dec_valid_node_count(sbi, dn->inode, !ofs); goto fail; } - f2fs_bug_on(sbi, new_ni.blk_addr != NULL_ADDR); + if (unlikely(new_ni.blk_addr != NULL_ADDR)) { + err = -EFSCORRUPTED; + set_sbi_flag(sbi, SBI_NEED_FSCK); + goto fail; + } #endif new_ni.nid = dn->nid; new_ni.ino = dn->inode->i_ino; -- 2.35.1