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 98514CDB474 for ; Mon, 23 Oct 2023 11:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233803AbjJWLUb (ORCPT ); Mon, 23 Oct 2023 07:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233826AbjJWLU2 (ORCPT ); Mon, 23 Oct 2023 07:20:28 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4333D10CE for ; Mon, 23 Oct 2023 04:20:23 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 768B2C433C8; Mon, 23 Oct 2023 11:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1698060022; bh=jQj8lpnii3kQlb7HzvBKMbaPE9ghwANoKJDKbap3sb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yrT64pQII/zeIYyd3Crilqi2zNIyoPnjJQzvAAugr3X+VdBfdkpXHmMNBcqLzKjJ+ LDFu6XXe/aP5+IgRvSk3inOv3WCMfHuMIny2h6MbGOd3tkahowjMecI38d6rPiE8xP GTP3dIbuBT4EEgRV7lvtuNmTf6MoR+ylH8fmwG3M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+e94d98936a0ed08bde43@syzkaller.appspotmail.com, Konstantin Komarov Subject: [PATCH 6.1 033/196] fs/ntfs3: fix deadlock in mark_as_free_ex Date: Mon, 23 Oct 2023 12:54:58 +0200 Message-ID: <20231023104829.423518550@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231023104828.488041585@linuxfoundation.org> References: <20231023104828.488041585@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konstantin Komarov commit bfbe5b31caa74ab97f1784fe9ade5f45e0d3de91 upstream. Reported-by: syzbot+e94d98936a0ed08bde43@syzkaller.appspotmail.com Signed-off-by: Konstantin Komarov Signed-off-by: Greg Kroah-Hartman --- fs/ntfs3/fsntfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -2428,10 +2428,12 @@ void mark_as_free_ex(struct ntfs_sb_info { 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; @@ -2485,6 +2487,8 @@ void mark_as_free_ex(struct ntfs_sb_info out: up_write(&wnd->rw_lock); + if (dirty) + ntfs_set_state(sbi, NTFS_DIRTY_ERROR); } /*