ext4: fix use-after-free in ext4_mb_new_blocks
PATCH 1/1 ext4: fix use-after-free in ext4_mb_new_blocks
ext4_mb_put_pa should hold pa->pa_lock before accessing pa->pa_count. While ext4_mb_use_preallocated checks pa->pa_deleted first and then increments pa->count later, ext4_mb_put_pa decrements pa->pa_count before holding pa->pa_lock and then sets pa->pa_deleted.
* Free sequenceext4_mb_put_pa (1): atomic_dec_and_test pa->pa_countext4_mb_put_pa (2): lock pa->pa_lockext4_mb_put_pa (3): check pa->pa_deletedext4_mb_put_pa (4): set pa->pa_deleted=1ext4_mb_put_pa (5): unlock pa->pa_lockext4_mb_put_pa (6): remove pa from a listext4_mb_pa_callback: free pa
* Use sequenceext4_mb_use_preallocated (1): iterate over preallocationext4_mb_use_preallocated (2): lock pa->pa_lockext4_mb_use_preallocated (3): check pa->pa_deletedext4_mb_use_preallocated (4): increase pa->pa_countext4_mb_use_preallocated (5): unlock pa->pa_lockext4_mb_release_context: access pa
* Use-after-free sequence
[initial status] <pa->pa_deleted = 0, pa_count = 1>ext4_mb_use_preallocated (1): iterate over preallocationext4_mb_use_preallocated (2): lock pa->pa_lockext4_mb_use_preallocated (3): check pa->pa_deletedext4_mb_put_pa (1): atomic_dec_and_test pa->pa_count
[pa_count decremented] <pa->pa_deleted = 0, pa_count = 0>ext4_mb_use_preallocated (4): increase pa->pa_count
[pa_count incremented] <pa->pa_deleted = 0, pa_count = 1>ext4_mb_use_preallocated (5): unlock pa->pa_lockext4_mb_put_pa (2): lock pa->pa_lockext4_mb_put_pa (3): check pa->pa_deletedext4_mb_put_pa (4): set pa->pa_deleted=1
[race condition!] <pa->pa_deleted = 1, pa_count = 1>ext4_mb_put_pa (5): unlock pa->pa_lockext4_mb_put_pa (6): remove pa from a listext4_mb_pa_callback: free paext4_mb_release_context: access pa
AddressSanitizer has detected use-after-free in ext4_mb_new_blocks Bug report: http://goo.gl/rG1On3
--- fs/ext4/mballoc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
fs/ext4/mballoc.c +3 -2
@@ -3442,6 +3442,9 @@ static void ext4_mb_pa_callback(struct rcu_head *head) {struct ext4_prealloc_space *pa; pa = container_of(head, struct ext4_prealloc_space, u.pa_rcu); + +BUG_ON (atomic_read (&pa->pa_count)); +BUG_ON (pa->pa_deleted ==0 );kmem_cache_free (ext4_pspace_cachep, pa); }
@@ -3455,11 +3458,13 @@ static void ext4_mb_put_pa(struct ext4_allocation_context *ac,ext4_group_t grp;ext4_fsblk_t grp_blk; -if (!atomic_dec_and_test (&pa->pa_count) || pa->pa_free !=0 ) -return ;
Quoted 41 lines · Junho Ryu
ext4_mb_put_pashould holdpa->pa_lockbefore accessingpa->pa_count. Whileext4_mb_use_preallocatedcheckspa->pa_deletedfirst and then incrementspa->countlater,ext4_mb_put_padecrementspa->pa_countbefore holdingpa->pa_lockand then setspa->pa_deleted.* Free sequence
ext4_mb_put_pa(1):atomic_dec_and_testpa->pa_countext4_mb_put_pa(2): lockpa->pa_lockext4_mb_put_pa(3): checkpa->pa_deletedext4_mb_put_pa(4): set pa->pa_deleted=1ext4_mb_put_pa(5): unlockpa->pa_lockext4_mb_put_pa(6): remove pa from a listext4_mb_pa_callback: free pa* Use sequence
ext4_mb_use_preallocated(1): iterate over preallocationext4_mb_use_preallocated(2): lockpa->pa_lockext4_mb_use_preallocated(3): checkpa->pa_deletedext4_mb_use_preallocated(4): increasepa->pa_countext4_mb_use_preallocated(5): unlockpa->pa_lockext4_mb_release_context: access pa* Use-after-free sequence
[initial status] <pa->pa_deleted= 0,pa_count= 1>ext4_mb_use_preallocated(1): iterate over preallocationext4_mb_use_preallocated(2): lockpa->pa_lockext4_mb_use_preallocated(3): checkpa->pa_deletedext4_mb_put_pa(1):atomic_dec_and_testpa->pa_count
[pa_countdecremented] <pa->pa_deleted= 0,pa_count= 0>ext4_mb_use_preallocated(4): increasepa->pa_count
[pa_countincremented] <pa->pa_deleted= 0,pa_count= 1>ext4_mb_use_preallocated(5): unlockpa->pa_lockext4_mb_put_pa(2): lockpa->pa_lockext4_mb_put_pa(3): checkpa->pa_deletedext4_mb_put_pa(4): set pa->pa_deleted=1
[race condition!] <pa->pa_deleted= 1,pa_count= 1>ext4_mb_put_pa(5): unlockpa->pa_lockext4_mb_put_pa(6): remove pa from a listext4_mb_pa_callback: free paext4_mb_release_context: access pa
Quoted 4 lines
AddressSanitizer has detected use-after-free in
ext4_mb_new_blocksBug report: http://goo.gl/rG1On3Signed-off-by Junho Ryu <[email protected]>
Thanks, applied.
- Ted