Skip to content

Commit 4e9316e

Browse files
YuKuai-huaweigregkh
authored andcommitted
md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime
commit 8d28d0d upstream. After commit ec6bb29 ("md/md-bitmap: add 'sync_size' into struct md_bitmap_stats"), following panic is reported: Oops: general protection fault, probably for non-canonical address RIP: 0010:bitmap_get_stats+0x2b/0xa0 Call Trace: <TASK> md_seq_show+0x2d2/0x5b0 seq_read_iter+0x2b9/0x470 seq_read+0x12f/0x180 proc_reg_read+0x57/0xb0 vfs_read+0xf6/0x380 ksys_read+0x6c/0xf0 do_syscall_64+0x82/0x170 entry_SYSCALL_64_after_hwframe+0x76/0x7e Root cause is that bitmap_get_stats() can be called at anytime if mddev is still there, even if bitmap is destroyed, or not fully initialized. Deferenceing bitmap in this case can crash the kernel. Meanwhile, the above commit start to deferencing bitmap->storage, make the problem easier to trigger. Fix the problem by protecting bitmap_get_stats() with bitmap_info.mutex. Cc: stable@vger.kernel.org # v6.12+ Fixes: 32a7627 ("[PATCH] md: optimised resync using Bitmap based intent logging") Reported-and-tested-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com> Closes: https://lore.kernel.org/linux-raid/ca3a91a2-50ae-4f68-b317-abd9889f3907@oracle.com/T/#m6e5086c95201135e4941fe38f9efa76daf9666c5 Signed-off-by: Yu Kuai <yukuai3@huawei.com> Link: https://lore.kernel.org/r/20250124092055.4050195-1-yukuai1@huaweicloud.com Signed-off-by: Song Liu <song@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ac12372 commit 4e9316e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

drivers/md/md-bitmap.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2355,7 +2355,10 @@ static int bitmap_get_stats(void *data, struct md_bitmap_stats *stats)
23552355

23562356
if (!bitmap)
23572357
return -ENOENT;
2358-
2358+
if (bitmap->mddev->bitmap_info.external)
2359+
return -ENOENT;
2360+
if (!bitmap->storage.sb_page) /* no superblock */
2361+
return -EINVAL;
23592362
sb = kmap_local_page(bitmap->storage.sb_page);
23602363
stats->sync_size = le64_to_cpu(sb->sync_size);
23612364
kunmap_local(sb);

drivers/md/md.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8376,6 +8376,10 @@ static int md_seq_show(struct seq_file *seq, void *v)
83768376
return 0;
83778377

83788378
spin_unlock(&all_mddevs_lock);
8379+
8380+
/* prevent bitmap to be freed after checking */
8381+
mutex_lock(&mddev->bitmap_info.mutex);
8382+
83798383
spin_lock(&mddev->lock);
83808384
if (mddev->pers || mddev->raid_disks || !list_empty(&mddev->disks)) {
83818385
seq_printf(seq, "%s : ", mdname(mddev));
@@ -8451,6 +8455,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
84518455
seq_printf(seq, "\n");
84528456
}
84538457
spin_unlock(&mddev->lock);
8458+
mutex_unlock(&mddev->bitmap_info.mutex);
84548459
spin_lock(&all_mddevs_lock);
84558460

84568461
if (mddev == list_last_entry(&all_mddevs, struct mddev, all_mddevs))

0 commit comments

Comments
 (0)