scsi: core: Fix a use-after-free
Subsystems (2)
PATCH 1/1 scsi: core: Fix a use-after-free
From: Bart Van Assche <[email protected]>
[ Upstream commit 8fe4ce5836e932f5766317cb651c1ff2a4cd0506 ]
There are two .exit_cmd_priv implementations. Both implementations use resources associated with the SCSI host. Make sure that these resources are still available when .exit_cmd_priv is called by waiting inside scsi_remove_host() until the tag set has been freed.
This commit fixes the following use-after-free:
==================================================================
BUG: KASAN: use-after-free in srp_exit_cmd_priv+0x27/0xd0 [ib_srp] Read of size 8 at addr ffff888100337000 by task multipathd/16727 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 print_report.cold+0x5e/0x5db kasan_report+0xab/0x120 srp_exit_cmd_priv+0x27/0xd0 [ib_srp] scsi_mq_exit_request+0x4d/0x70 blk_mq_free_rqs+0x143/0x410 __blk_mq_free_map_and_rqs+0x6e/0x100 blk_mq_free_tag_set+0x2b/0x160 scsi_host_dev_release+0xf3/0x1a0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_device_dev_release_usercontext+0x4c1/0x4e0 execute_in_process_context+0x23/0x90 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_disk_release+0x3f/0x50 device_release+0x54/0xe0 kobject_put+0xa5/0x120 disk_release+0x17f/0x1b0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 dm_put_table_device+0xa3/0x160 [dm_mod] dm_put_device+0xd0/0x140 [dm_mod] free_priority_group+0xd8/0x110 [dm_multipath] free_multipath+0x94/0xe0 [dm_multipath] dm_table_destroy+0xa2/0x1e0 [dm_mod] __dm_destroy+0x196/0x350 [dm_mod] dev_remove+0x10c/0x160 [dm_mod] ctl_ioctl+0x2c2/0x590 [dm_mod] dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0
[mheyne: fixed contextual conflicts:
- drivers/scsi/hosts.c: due to missing commit 973dac8a8a14 ("scsi: core: Refine how we set tag_set NUMA node")
- drivers/scsi/scsi_sysfs.c: due to missing commit 6f8191fdf41d ("block: simplify disk shutdown")
- drivers/scsi/scsi_scan.c: due to missing commit 59506abe5e34 ("scsi: core: Inline scsi_mq_alloc_queue()")]
--- drivers/scsi/hosts.c | 16 +++++++++++++--- drivers/scsi/scsi_lib.c | 6 +++++- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_scan.c | 1 + drivers/scsi/scsi_sysfs.c | 1 + include/scsi/scsi_host.h | 2 ++ 6 files changed, 23 insertions(+), 5 deletions(-)
drivers/scsi/hosts.c +13 -3
@@ -182,6 +182,15 @@ void scsi_remove_host(struct Scsi_Host *shost)scsi_proc_host_rm (shost);scsi_proc_hostdir_rm (shost->hostt); +/* +* New SCSI devices cannot be attached anymore because of the SCSI host +* state so drop the tag set refcnt. Wait until the tag set refcnt drops +* to zero because .exit_cmd_priv implementations may need the host +* pointer. +*/ +kref_put (&shost->tagset_refcnt, scsi_mq_free_tags); +wait_for_completion (&shost->tagset_freed); +spin_lock_irqsave (shost->host_lock, flags);if (scsi_host_set_state (shost,SHOST_DEL ))BUG_ON (scsi_host_set_state (shost,SHOST_DEL_RECOVERY ));
@@ -240,6 +249,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, shost->dma_dev = dma_dev; +kref_init (&shost->tagset_refcnt); +init_completion (&shost->tagset_freed); +/* * Increase usage count temporarily here so that calling * scsi_autopm_put_host() will trigger runtime idle if there is
@@ -312,6 +324,7 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,pm_runtime_disable (&shost->shost_gendev);pm_runtime_set_suspended (&shost->shost_gendev);pm_runtime_put_noidle (&shost->shost_gendev); +kref_put (&shost->tagset_refcnt, scsi_mq_free_tags); fail:return error; }
@@ -344,9 +357,6 @@ static void scsi_host_dev_release(struct device *dev)kfree (dev_name (&shost->shost_dev)); } -if (shost->tag_set.tags) -scsi_mq_destroy_tags (shost); -kfree (shost->shost_data);ida_simple_remove (&host_index_ida, shost->host_no);
drivers/scsi/scsi_lib.c +5 -1
@@ -1923,9 +1923,13 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)return blk_mq_alloc_tag_set (tag_set); } -void scsi_mq_destroy_tags (struct Scsi_Host *shost) +void scsi_mq_free_tags (struct kref *kref) { +struct Scsi_Host *shost =container_of (kref,typeof (*shost), + tagset_refcnt); +blk_mq_free_tag_set (&shost->tag_set); +complete (&shost->tagset_freed); }/**
drivers/scsi/scsi_priv.h +1 -1
@@ -93,7 +93,7 @@ extern void scsi_requeue_run_queue(struct work_struct *work);extern struct request_queue *scsi_mq_alloc_queue (struct scsi_device *sdev);extern void scsi_start_queue (struct scsi_device *sdev);extern int scsi_mq_setup_tags (struct Scsi_Host *shost); -extern void scsi_mq_destroy_tags (struct Scsi_Host *shost); +extern void scsi_mq_free_tags (struct kref *kref);extern void scsi_exit_queue (void );extern void scsi_evt_thread (struct work_struct *work);struct request_queue ;
drivers/scsi/scsi_scan.c +1 -0
@@ -273,6 +273,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,kfree (sdev); goto out; } +kref_get (&sdev->host->tagset_refcnt);WARN_ON_ONCE (!blk_get_queue (sdev->request_queue)); sdev->request_queue->queuedata = sdev;
drivers/scsi/scsi_sysfs.c +1 -0
@@ -1481,6 +1481,7 @@ void __scsi_remove_device(struct scsi_device *sdev)mutex_unlock (&sdev->state_mutex);blk_cleanup_queue (sdev->request_queue); +kref_put (&sdev->host->tagset_refcnt, scsi_mq_free_tags);cancel_work_sync (&sdev->requeue_work);if (sdev->host->hostt->slave_destroy)
include/scsi/scsi_host.h +2 -0
@@ -548,6 +548,8 @@ struct Scsi_Host {struct scsi_host_template *hostt;struct scsi_transport_template *transportt; +struct kref tagset_refcnt; +struct completion tagset_freed;/* Area to keep a shared tag map */ struct blk_mq_tag_set tag_set;
Signature · 12 lines
2.40.1 Amazon Web Services Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597
Greg KH
maintainerQuoted 66 lines · Maximilian Heyne
From: Bart Van Assche <[email protected]>
[ Upstream commit
8fe4ce5836e932f5766317cb651c1ff2a4cd0506]There are two .exit_cmd_priv implementations. Both implementations use resources associated with the SCSI host. Make sure that these resources are still available when .exit_cmd_priv is called by waiting inside
scsi_remove_host()until the tag set has been freed.This commit fixes the following use-after-free:
==================================================================
BUG: KASAN: use-after-free in srp_exit_cmd_priv+0x27/0xd0 [ib_srp] Read of size 8 at addr ffff888100337000 by task multipathd/16727 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 print_report.cold+0x5e/0x5db kasan_report+0xab/0x120 srp_exit_cmd_priv+0x27/0xd0 [ib_srp] scsi_mq_exit_request+0x4d/0x70 blk_mq_free_rqs+0x143/0x410 __blk_mq_free_map_and_rqs+0x6e/0x100 blk_mq_free_tag_set+0x2b/0x160 scsi_host_dev_release+0xf3/0x1a0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_device_dev_release_usercontext+0x4c1/0x4e0 execute_in_process_context+0x23/0x90 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_disk_release+0x3f/0x50 device_release+0x54/0xe0 kobject_put+0xa5/0x120 disk_release+0x17f/0x1b0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 dm_put_table_device+0xa3/0x160 [dm_mod] dm_put_device+0xd0/0x140 [dm_mod] free_priority_group+0xd8/0x110 [dm_multipath] free_multipath+0x94/0xe0 [dm_multipath] dm_table_destroy+0xa2/0x1e0 [dm_mod] __dm_destroy+0x196/0x350 [dm_mod] dev_remove+0x10c/0x160 [dm_mod] ctl_ioctl+0x2c2/0x590 [dm_mod] dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0Fixes 65ca846a5314 ("scsi: core: Introduce {init,exit}_cmd_priv()")Cc Ming Lei <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Mike Christie <[email protected]>Cc Hannes Reinecke <[email protected]>Cc John Garry <[email protected]>Cc Li Zhijian <[email protected]>Reported-by Li Zhijian <[email protected]>Tested-by Li Zhijian <[email protected]>Signed-off-by Bart Van Assche <[email protected]>Signed-off-by Martin K. Petersen <[email protected]>
Quoted 6 lines
[mheyne: fixed contextual conflicts:
-drivers/scsi/hosts.c: due to missing commit973dac8a8a14("scsi: core: Refine how we settag_setNUMA node")
-drivers/scsi/scsi_sysfs.c: due to missing commit6f8191fdf41d("block: simplify disk shutdown")
-drivers/scsi/scsi_scan.c: due to missing commit59506abe5e34("scsi: core: Inlinescsi_mq_alloc_queue()")]Signed-off-by Maximilian Heyne <[email protected]>Cc [email protected] # v5.10
Both now backported, thanks.
greg k-h