Skip to content

Commit 24ab70d

Browse files
committed
Merge tag 'md-fixes-2023-03-29' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.3
Pull MD fix from Song. * tag 'md-fixes-2023-03-29' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: md: fix regression for null-ptr-deference in __md_stop()
2 parents 1a06ed2 + 433279b commit 24ab70d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/md/md.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6260,7 +6260,6 @@ static void __md_stop(struct mddev *mddev)
62606260
module_put(pers->owner);
62616261
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
62626262

6263-
percpu_ref_exit(&mddev->writes_pending);
62646263
percpu_ref_exit(&mddev->active_io);
62656264
bioset_exit(&mddev->bio_set);
62666265
bioset_exit(&mddev->sync_set);
@@ -6273,6 +6272,7 @@ void md_stop(struct mddev *mddev)
62736272
*/
62746273
__md_stop_writes(mddev);
62756274
__md_stop(mddev);
6275+
percpu_ref_exit(&mddev->writes_pending);
62766276
}
62776277

62786278
EXPORT_SYMBOL_GPL(md_stop);
@@ -7843,6 +7843,7 @@ static void md_free_disk(struct gendisk *disk)
78437843
{
78447844
struct mddev *mddev = disk->private_data;
78457845

7846+
percpu_ref_exit(&mddev->writes_pending);
78467847
mddev_free(mddev);
78477848
}
78487849

0 commit comments

Comments
 (0)