From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A32B4C4167D for ; Sun, 29 Oct 2023 22:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231401AbjJ2W74 (ORCPT ); Sun, 29 Oct 2023 18:59:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231484AbjJ2W7U (ORCPT ); Sun, 29 Oct 2023 18:59:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7611C4685; Sun, 29 Oct 2023 15:58:31 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93786C433B8; Sun, 29 Oct 2023 22:57:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620268; bh=flMynxBOlvcAvl2dtixiORz6/+bk9Trbkz1X6lpFP78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A0/aT/iJ1XOp4bgdyOFE8vw2l28jKiOB3NrjOFTKxW94nsvnTmEbtwKLqSdkltu6D Ek0bn9fDGqmy7vNcOTw03O4Yfy+QvY63ZHvWYSvQGEaUdVkRk3UQPQKGdJFapcdWid DZqvbtMUU27EvyJLVw0fpc8+YyaGgyQdJ0s97mOtjjUGld7JDy/EXd8Xkr2suOkRlr 1fKtnGDvODUxM7Hygr0A6/1IHLm4eTbrqwJo2YsiOf0zI0Ik7joptMQ3AJSBS230Q8 96SRmTRJkN0cR3icry08ecL4vwK+7uOQHwP0Ikd9zxP8bJEW/X9kv5Cep6vCqqO3Oz vPAHpOKu8zlBQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Komarov , syzbot+e94d98936a0ed08bde43@syzkaller.appspotmail.com, Sasha Levin , ntfs3@lists.linux.dev Subject: [PATCH AUTOSEL 6.1 05/39] fs/ntfs3: fix deadlock in mark_as_free_ex Date: Sun, 29 Oct 2023 18:56:37 -0400 Message-ID: <20231029225740.790936-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225740.790936-1-sashal@kernel.org> References: <20231029225740.790936-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.60 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Konstantin Komarov [ Upstream commit bfbe5b31caa74ab97f1784fe9ade5f45e0d3de91 ] Reported-by: syzbot+e94d98936a0ed08bde43@syzkaller.appspotmail.com Signed-off-by: Konstantin Komarov Signed-off-by: Sasha Levin --- fs/ntfs3/fsntfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 4b79232aeb59b..873b1434a9989 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -2421,10 +2421,12 @@ void mark_as_free_ex(struct ntfs_sb_info *sbi, CLST lcn, CLST len, bool trim) { CLST end, i, zone_len, zlen; struct wnd_bitmap *wnd = &sbi->used.bitmap; + bool dirty = false; down_write_nested(&wnd->rw_lock, BITMAP_MUTEX_CLUSTERS); if (!wnd_is_used(wnd, lcn, len)) { - ntfs_set_state(sbi, NTFS_DIRTY_ERROR); + /* mark volume as dirty out of wnd->rw_lock */ + dirty = true; end = lcn + len; len = 0; @@ -2478,6 +2480,8 @@ void mark_as_free_ex(struct ntfs_sb_info *sbi, CLST lcn, CLST len, bool trim) out: up_write(&wnd->rw_lock); + if (dirty) + ntfs_set_state(sbi, NTFS_DIRTY_ERROR); } /* -- 2.42.0