Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd5e34b authored by Joel D. Diaz's avatar Joel D. Diaz Committed by James Bottomley
Browse files

[SCSI] sd: Reshuffle init_sd to avoid crash 



scsi_register_driver will register a prep_fn() function, which
in turn migh need to use the sd_cdp_pool for DIF.
Which hasn't been initialised at this point, leading to
a crash. So reshuffle the init_sd() and exit_sd() paths
to have the driver registered last.

Signed-off-by: default avatarJoel D. Diaz <joeldiaz@us.ibm.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 500c152a

drivers/scsi/sd.c

+8 −5
Original line number Diff line number Diff line
@@ -3116,10 +3116,6 @@ static int __init init_sd(void) 
	if (err)

		goto err_out;



	err = scsi_register_driver(&sd_template.gendrv);

	if (err)

		goto err_out_class;



	sd_cdb_cache = kmem_cache_create("sd_ext_cdb", SD_EXT_CDB_SIZE,

					 0, 0, NULL);

	if (!sd_cdb_cache) {
@@ -3133,8 +3129,15 @@ static int __init init_sd(void) 
		goto err_out_cache;

	}



	err = scsi_register_driver(&sd_template.gendrv);

	if (err)

		goto err_out_driver;



	return 0;



err_out_driver:

	mempool_destroy(sd_cdb_pool);



err_out_cache:

	kmem_cache_destroy(sd_cdb_cache);
@@ -3157,10 +3160,10 @@ static void __exit exit_sd(void) 


	SCSI_LOG_HLQUEUE(3, printk("exit_sd: exiting sd driver\n"));



	scsi_unregister_driver(&sd_template.gendrv);

	mempool_destroy(sd_cdb_pool);

	kmem_cache_destroy(sd_cdb_cache);



	scsi_unregister_driver(&sd_template.gendrv);

	class_unregister(&sd_disk_class);



	for (i = 0; i < SD_MAJORS; i++)