Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3408156rwa; Tue, 23 Aug 2022 04:24:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR7I/DQz5b2MJkftcYWWYZdgeQhh1IQmhZYAV8sz2cws6zH7xnYFVas4bXYlgvXteFLzJRM/ X-Received: by 2002:a17:903:22c1:b0:16e:fbcc:f298 with SMTP id y1-20020a17090322c100b0016efbccf298mr24742674plg.2.1661253839987; Tue, 23 Aug 2022 04:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253839; cv=none; d=google.com; s=arc-20160816; b=cd/C/TpndLbIUyJql4IgWVX1iHzAWjBlYHtbK+DUDJxBM9BChd4i2rxdtWibku6XyO 2H6m01CBCobuzJCfB4I85KNyzCKgSG+FI0rgFpRZ64uC2cUFBSNMc8jG573N/gzM/3CN yDlf/fkSQ9CyXeYpjmk2bey38tfMEgDGApNP22AD+tYVSpy7p9wTUZK3Wag4CggQ5JbU 4ildUwaw4TOcEp6YDiPWorRulBwZDPiWQbpS//LCMjd6Y3U+jenbThPXMQq61gWuUWGY efKztg3GGc06t59tjoEjYwv8G0orGqWvqJi759PhHj2KdnCl7vn2kVadwy0twpWgRwkQ fq8Q== 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=Xzx7zJRhLf1PG6hnk6eh5JK5DhdjeFEdcEqQAp8LaKA=; b=WVLkMiUybvj7TrjzPFtNLH08eIlrmF/P3DHjVistgAKMf7C48FDhFjzJLGc2ThZXxA 2DQbUCs9Ln8OlL7Xa/PQzDcvfBaDuTeUzIZwxKQJEux+WOXKT4JK2vKS2F3ckFM5qVtt +kOxdj8DNpZIv7TtUOtacM8xklhCbi4ruU6eoVVZ9xFaE+5gW9GcbJ09riE6snTIGesD xDfqPCXre23cbgiArdZ+JrEfIf9FOXnRIXeMzuLg6B9sbGLpNZ0UegKPN2lmFpx9ohj3 dGyco6rz4l+zd1b0Z3GYzUepPpx6L4JarNYoKlvFRjp0ei0uVKAORQvTmZ7VC68ICtz7 p5aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="ZO1wIj/r"; 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 k4-20020a654344000000b003ab358a4d44si14345144pgq.199.2022.08.23.04.23.45; Tue, 23 Aug 2022 04:23:59 -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="ZO1wIj/r"; 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 S1354649AbiHWK2h (ORCPT + 99 others); Tue, 23 Aug 2022 06:28:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352164AbiHWKM2 (ORCPT ); Tue, 23 Aug 2022 06:12:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4324F26D6; Tue, 23 Aug 2022 01:58:55 -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 E0083B81C39; Tue, 23 Aug 2022 08:58:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30901C433D6; Tue, 23 Aug 2022 08:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661245132; bh=/jfp8U8V850bZODnU1RZhL/AMJJd513LUtYsEK6JinA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZO1wIj/rS9kzXrgzirY9YobWdLhHzo+vV1vG6KNWx4nhKCZYDUoLqMKoJw3UMW+pX tie+ZbSvth1l2duZUXPBWIz/lmnO97LYPOtTD6X490vpClhHtsZNcDp8vc36so7fVa /fL6aeFv6wR7u0zVRIhX4LXkTTphIC9M1qiNa6SI= 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 5.15 227/244] f2fs: fix to avoid use f2fs_bug_on() in f2fs_new_node_page() Date: Tue, 23 Aug 2022 10:26:26 +0200 Message-Id: <20220823080107.119633730@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@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 69c6bcaf5aae..0e6e73bc42d4 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1291,7 +1291,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