Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

torvalds · torvalds · commit 0001ec9b1418 · 2021-02-13T14:14:47.000-08:00
Pull SCSI fix from James Bottomley:
 "One fix for scsi_debug that fixes a memory leak on module removal"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: scsi_debug: Fix a memory leak
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
@@ -6881,6 +6881,7 @@ static void __exit scsi_debug_exit(void)
 
 	sdebug_erase_all_stores(false);
 	xa_destroy(per_store_ap);
+	kfree(sdebug_q_arr);
 }
 
 device_initcall(scsi_debug_init);

Original file line number	Diff line number	Diff line change
`@@ -6881,6 +6881,7 @@ static void __exit scsi_debug_exit(void)`
`6881`	`6881`
`6882`	`6882`	`sdebug_erase_all_stores(false);`
`6883`	`6883`	`xa_destroy(per_store_ap);`
	`6884`	`+ kfree(sdebug_q_arr);`
`6884`	`6885`	`}`
`6885`	`6886`
`6886`	`6887`	`device_initcall(scsi_debug_init);`