Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp7040456rdb; Wed, 3 Jan 2024 02:32:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNNZIjbDN2MSEJrntC4mI/aqp45kYM+KzGklkIA67gvZhpJTGrdBEoAmgx+24CsoGcryxy X-Received: by 2002:a17:907:7211:b0:a28:872:9293 with SMTP id dr17-20020a170907721100b00a2808729293mr950818ejc.18.1704277932076; Wed, 03 Jan 2024 02:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704277932; cv=none; d=google.com; s=arc-20160816; b=lSeyPLfUTS2zk2pDs57pt4gjiXQveVUOW4zDKcyFKoxhgSKkUYEasXqX6Zo84MQeFG yt/O8YQzi8QVdCNZj0M2nc+vvZ+GToAzAgBqhjlwZQ6jt5Y0lxSc5aNAMDw0nbOnI7/d UYR+3VNGMU4bFmRxYM6hT2S8Iv1vH0BkkAxhy1wzo89aCJw5beEO1UDDg3Kq61lGfRmi z0eT97qkuUAV7yC4jXqo8iFwwvs3m/+rn5uGxr3czZ3IlOkcSiuEj5aENMp3J21piOxX KTMig0UYTAZ3o2U85iogetWdPdZ1RLR17QwyeNwiaE4AMmSuyXVCDRK4Lbm1Y2Ao3LEl 9QmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature:dkim-filter; bh=ATVmhgg0EGQ8+kx8YSDYDd5FGVTMUjphxtGXvmXrX8Q=; fh=qIQV99bTDcBYn2uI5+IL2xlom/P1bCZfIcU6hL3Rl6c=; b=HwaXhFdiOtQk9CaYxXWCREiPEre0Nsl+gj8rxgC4WatuD1Y2Uv0wBdlMdOhqFQkxkC 51/0EhQAhiXpKbTaV/dAilJytAbXd4lOkkC6vJxdlL9etNJNHu1I9ffv02C4bE4owDXS sGtOAxhbfPTTj1ekzXPpSHsd8CaJ8IslGxUgwJNftVRfRyuoCI6WCYbiLtCRO+3omM4F gptbghJpbMTcSo7E6DCClLYuzGa5eLW5u2V5lv3GMG/mK3hd/zzmhFLkY1v3gO1Utlpc lHRXr7OXCwwZFvtXMNAnpqG6yXzMIYlDC9NtvVA2tgf/w04S3IUxepL6MCeyuIP2u4qs jA+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=jIELgv8R; spf=pass (google.com: domain of linux-kernel+bounces-15394-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15394-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id qh20-20020a170906ecb400b00a2786c24e83si3974437ejb.221.2024.01.03.02.32.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 02:32:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-15394-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=jIELgv8R; spf=pass (google.com: domain of linux-kernel+bounces-15394-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15394-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C99EA1F24126 for ; Wed, 3 Jan 2024 10:32:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1EAB418C20; Wed, 3 Jan 2024 10:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ispras.ru header.i=@ispras.ru header.b="jIELgv8R" X-Original-To: linux-kernel@vger.kernel.org Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56A2E18C08; Wed, 3 Jan 2024 10:31:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ispras.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ispras.ru Received: from localhost.ispras.ru (unknown [10.10.165.5]) by mail.ispras.ru (Postfix) with ESMTPSA id DDEE840F1DDD; Wed, 3 Jan 2024 10:31:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru DDEE840F1DDD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1704277908; bh=ATVmhgg0EGQ8+kx8YSDYDd5FGVTMUjphxtGXvmXrX8Q=; h=From:To:Cc:Subject:Date:From; b=jIELgv8RSLOsnL8WW8pVFFNDcK2dIsSYuafpZ9Yjd90IVFMkiKYNv15sm8XIGKsaV BdPGfreSc7IxQXuXkr1lo7ViCZ/hOMtJym1onr+MiVXBVb0vZT1vBIbOEIwea1QCFh rl+ibCedpRc6EQpwW0ik+lHWQKqFDg2Oz04/rnHU= From: Fedor Pchelkin To: Josef Bacik Cc: Fedor Pchelkin , David Sterba , Chris Mason , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org, syzbot+be14ed7728594dc8bd42@syzkaller.appspotmail.com, syzbot+c563a3c79927971f950f@syzkaller.appspotmail.com Subject: [PATCH] btrfs: ref-verify: free ref cache before clearing mount opt Date: Wed, 3 Jan 2024 13:31:27 +0300 Message-ID: <20240103103128.30095-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As clearing REF_VERIFY mount option indicates there were some errors in a ref-verify process, a ref cache is not relevant anymore and should be freed. btrfs_free_ref_cache() requires REF_VERIFY option being set so call it just before clearing the mount option. Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: fd708b81d972 ("Btrfs: add a extent ref verify tool") Reported-by: syzbot+be14ed7728594dc8bd42@syzkaller.appspotmail.com Closes: https://lore.kernel.org/lkml/000000000000e5a65c05ee832054@google.com/ Reported-by: syzbot+c563a3c79927971f950f@syzkaller.appspotmail.com Closes: https://lore.kernel.org/lkml/0000000000007fe09705fdc6086c@google.com/ Signed-off-by: Fedor Pchelkin --- fs/btrfs/ref-verify.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c index 6486f0d7e993..8c4fc98ca9ce 100644 --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -889,8 +889,10 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, out_unlock: spin_unlock(&fs_info->ref_verify_lock); out: - if (ret) + if (ret) { + btrfs_free_ref_cache(fs_info); btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); + } return ret; } @@ -1021,8 +1023,8 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info) } } if (ret) { - btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); btrfs_free_ref_cache(fs_info); + btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); } btrfs_free_path(path); return ret; -- 2.43.0