From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0E6612E51 for ; Sun, 29 Oct 2023 22:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Uk2b7+T0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51A9EC433C7; Sun, 29 Oct 2023 22:54:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620094; bh=JmAbRc2bNxm64mujRiq0keRT7xLH5Et6Oi008/fCrMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uk2b7+T0ZHuBUzg8n82ML5+LpQ+NP5wQWAto2jtDrC16lccXU8QCho1sOU4o8EF65 8yg6otrLkHz+zh0DYeYmz1zpxC2+MJ1Ll+v9Lxxiu8CwUNN7+yQXFp9FRUTmnDOIVh BunkXxhsAHceajUiQCEdfInMXgRCqJelRII15ExapHijjw7HTaCuPj2iSKdPsYyhF6 giIz6Q91aitFsiwH2pzvqm3UpQFoHLYaKk2L935QR+kUhAwdJxCUNm/niEZTz0HFgG iaIWyRS8zrxyuBlZ59rIOhcxyf7u+i3sQSdCLkAo4clQfogqHdaAO93iP7AU8/UF1N vFJylDSc8kF+g== 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.5 06/52] fs/ntfs3: fix deadlock in mark_as_free_ex Date: Sun, 29 Oct 2023 18:52:53 -0400 Message-ID: <20231029225441.789781-6-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225441.789781-1-sashal@kernel.org> References: <20231029225441.789781-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit 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 edb51dc12f65f..fbfe21dbb4259 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -2454,10 +2454,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; @@ -2511,6 +2513,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