linux-kernel - Re: [syzbot] [udf?] possible deadlock in udf_free

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250415154254.15330-1-aha310510@gmail.com>
Date: Wed, 16 Apr 2025 00:42:54 +0900
From: Jeongjun Park <aha310510@...il.com>
To: syzbot+d472c32c5dd4cd2fb5c5@...kaller.appspotmail.com
Cc: linux-kernel@...r.kernel.org,
	syzkaller-bugs@...glegroups.com
Subject: Re: [syzbot] [udf?] possible deadlock in udf_free_blocks

#syz test git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master

---
 fs/udf/balloc.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 807c493ed0cd..f70d13eaedce 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -657,8 +657,10 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode,
 		     uint32_t count)
 {
 	uint16_t partition = bloc->partitionReferenceNum;
-	struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[partition];
+	struct udf_sb_info *sbi = UDF_SB(sb);
+	struct udf_part_map *map = &sbi->s_partmaps[partition];
 	uint32_t blk;
+	bool islocked = false;
 
 	if (check_add_overflow(bloc->logicalBlockNum, offset, &blk) ||
 	    check_add_overflow(blk, count, &blk) ||
@@ -670,6 +672,11 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode,
 		return;
 	}
 
+	islocked = mutex_is_locked(&sbi->s_alloc_mutex);
+
+	if (islocked)
+		mutex_unlock(&sbi->s_alloc_mutex);
+
 	if (map->s_partition_flags & UDF_PART_FLAG_UNALLOC_BITMAP) {
 		udf_bitmap_free_blocks(sb, map->s_uspace.s_bitmap,
 				       bloc, offset, count);
@@ -678,6 +685,9 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode,
 				      bloc, offset, count);
 	}
 
+	if (islocked)
+		mutex_lock(&sbi->s_alloc_mutex);
+
 	if (inode) {
 		inode_sub_bytes(inode,
 				((sector_t)count) << sb->s_blocksize_bits);
--