In the Linux kernel, the following vulnerability has been resolved:
btrfs: fix deadlock with fiemap and extent locking
While working on the patchset to remove extent locking I got a lockdep splat with fiemap and pagefaulting with my new extent lock replacement lock.
This deadlock exists with our normal code, we just don't have lockdep annotations with the extent locking so we've never noticed it.
Since we're copying the fiemap extent to user space on every iteration we have the chance of pagefaulting. Because we hold the extent lock for the entire range we could mkwrite into a range in the file that we have mmap'ed. This would deadlock with the following stack trace
[<0>] lock_extent+0x28d/0x2f0 [<0>] btrfs_page_mkwrite+0x273/0x8a0 [<0>] do_page_mkwrite+0x50/0xb0 [<0>] do_fault+0xc1/0x7b0 [<0>] __handle_mm_fault+0x2fa/0x460 [<0>] handle_mm_fault+0xa4/0x330 [<0>] do_user_addr_fault+0x1f4/0x800 [<0>] exc_page_fault+0x7c/0x1e0 [<0>] asm_exc_page_fault+0x26/0x30 [<0>] rep_movs_alternative+0x33/0x70 [<0>] _copy_to_user+0x49/0x70 [<0>] fiemap_fill_next_extent+0xc8/0x120 [<0>] emit_fiemap_extent+0x4d/0xa0 [<0>] extent_fiemap+0x7f8/0xad0 [<0>] btrfs_fiemap+0x49/0x80 [<0>] __x64_sys_ioctl+0x3e1/0xb50 [<0>] do_syscall_64+0x94/0x1a0 [<0>] entry_SYSCALL_64_after_hwframe+0x6e/0x76
I wrote an fstest to reproduce this deadlock without my replacement lock and verified that the deadlock exists with our existing locking.
To fix this simply don't take the extent lock for the entire duration of the fiemap. This is safe in general because we keep track of where we are when we're searching the tree, so if an ordered extent updates in the middle of our fiemap call we'll still emit the correct extents because we know what offset we were on before.
The only place we maintain the lock is searching delalloc. Since the delalloc stuff can change during writeback we want to lock the extent range so we have a consistent view of delalloc at the time we're checking to see if we need to set the delalloc flag.
With this patch applied we no longer deadlock with my testcase.
CVSS Details
- CVSS 3.1 Base Score: 5.5
- CVSS 3.1 Vector: (CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:N/I:N/A:H)
Covered by Rapid7
| Product | Vendor Advisory | Solution File | Added | Published |
|---|---|---|---|---|
| Debian | — | Upgrade linux | May 15, 2025 | May 17, 2024 |
| Redhat_linux | — | No solution exists | Jul 9, 2025 | May 17, 2024 |
| Suse | — | Upgrade kernel-syms-rtUpgrade kernel-devel-azureUpgrade kernel-symsUpgrade kernel-zfcpdumpUpgrade kernel-azure-livepatch-develUpgrade kernel-64kb-optionalUpgrade kernel-devel-rtUpgrade kernel-debug-develUpgrade kernel-syms-azureUpgrade kernel-azure-vdsoUpgrade reiserfs-kmp-rtUpgrade kernel-rt-livepatch-develUpgrade kernel-default-extraUpgrade kernel-kvmsmallUpgrade kernel-rt_debugUpgrade kernel-64kbUpgrade kselftests-kmp-defaultUpgrade dtb-apmUpgrade kernel-macrosUpgrade kernel-64kb-develUpgrade dtb-mediatekUpgrade gfs2-kmp-rtUpgrade ocfs2-kmp-rtUpgrade kernel-rt_debug-vdsoUpgrade kernel-docsUpgrade dtb-armUpgrade dtb-amlogicUpgrade gfs2-kmp-64kbUpgrade cluster-md-kmp-defaultUpgrade reiserfs-kmp-azureUpgrade cluster-md-kmp-azureUpgrade dlm-kmp-azureUpgrade kernel-debugUpgrade kernel-rt-develUpgrade dlm-kmp-defaultUpgrade kernel-64kb-livepatch-develUpgrade dtb-socionextUpgrade kernel-kvmsmall-develUpgrade kernel-debug-livepatch-develUpgrade kernel-azure-develUpgrade dtb-qcomUpgrade kernel-obs-qaUpgrade dtb-hisiliconUpgrade kselftests-kmp-rtUpgrade kernel-rtUpgrade kernel-azure-extraUpgrade kernel-64kb-extraUpgrade kernel-kvmsmall-vdsoUpgrade dlm-kmp-64kbUpgrade kernel-debug-vdsoUpgrade kernel-defaultUpgrade ocfs2-kmp-azureUpgrade dtb-amdUpgrade kernel-default-livepatch-develUpgrade kernel-develUpgrade dtb-xilinxUpgrade reiserfs-kmp-64kbUpgrade kernel-default-baseUpgrade dtb-rockchipUpgrade kernel-sourceUpgrade kernel-rt_debug-develUpgrade kernel-rt-extraUpgrade dtb-renesasUpgrade dtb-broadcomUpgrade cluster-md-kmp-64kbUpgrade kernel-kvmsmall-livepatch-develUpgrade dtb-alteraUpgrade ocfs2-kmp-defaultUpgrade kernel-default-optionalUpgrade gfs2-kmp-defaultUpgrade dtb-marvellUpgrade dtb-freescaleUpgrade kernel-azureUpgrade dtb-nvidiaUpgrade ocfs2-kmp-64kbUpgrade kernel-obs-buildUpgrade kernel-default-vdsoUpgrade kernel-default-develUpgrade kernel-source-vanillaUpgrade kselftests-kmp-azureUpgrade kernel-default-base-rebuildUpgrade kernel-rt-vdsoUpgrade cluster-md-kmp-rtUpgrade reiserfs-kmp-defaultUpgrade kernel-docs-htmlUpgrade kernel-default-livepatchUpgrade dtb-sprdUpgrade dtb-lgUpgrade dtb-caviumUpgrade kernel-azure-optionalUpgrade kselftests-kmp-64kbUpgrade dtb-allwinnerUpgrade kernel-source-rtUpgrade kernel-rt-optionalUpgrade dtb-amazonUpgrade dtb-appleUpgrade kernel-source-azureUpgrade dtb-exynosUpgrade kernel-rt_debug-livepatch-develUpgrade dlm-kmp-rtUpgrade gfs2-kmp-azure | Jun 24, 2024 | May 17, 2024 |
| Ubuntu | — | Upgrade linux-raspi-realtime | Feb 11, 2025 | May 17, 2024 |
Prioritise with Active Threat Intelligence
With curated Threat Intelligence, you can see which vulnerabilities truly put you at risk, prioritize what matters most, and act before attackers do.
Explore Intelligence Hub