diff options
| author | Junichi Nomura <j-nomura@ce.jp.nec.com> | 2015-10-06 06:32:57 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-10-27 03:22:37 +0100 |
| commit | 23695e41a1cac017edad2b38607f33678a31b877 (patch) | |
| tree | 2cadb3d6276f29f8a3555b8601d91c4aaa15d50e /drivers/scsi/scsi_dh.c | |
| parent | mvsas: Fix NULL pointer dereference in mvs_slot_task_free (diff) | |
| download | linux-23695e41a1cac017edad2b38607f33678a31b877.tar.xz linux-23695e41a1cac017edad2b38607f33678a31b877.zip | |
scsi_dh: fix use-after-free when removing scsi device
The commit 1bab0de0274f ("dm-mpath, scsi_dh: don't let dm detach device
handlers") removed reference counting of attached scsi device handler.
As a result, handler data is freed immediately via scsi_dh->detach()
in the context of scsi_remove_device() where activation request can be
still in flight.
This patch moves scsi_dh_handler_detach() to sdev releasing function,
scsi_device_dev_release_usercontext(), at that point the device
is already in quiesced state.
Fixes: 1bab0de0274f ("dm-mpath, scsi_dh: don't let dm detach device handlers")
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/scsi_dh.c')
| -rw-r--r-- | drivers/scsi/scsi_dh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c index 0a2168e69bbc..cb78388de3fc 100644 --- a/drivers/scsi/scsi_dh.c +++ b/drivers/scsi/scsi_dh.c @@ -232,10 +232,14 @@ int scsi_dh_add_device(struct scsi_device *sdev) return err; } -void scsi_dh_remove_device(struct scsi_device *sdev) +void scsi_dh_release_device(struct scsi_device *sdev) { if (sdev->handler) scsi_dh_handler_detach(sdev); +} + +void scsi_dh_remove_device(struct scsi_device *sdev) +{ device_remove_file(&sdev->sdev_gendev, &scsi_dh_state_attr); } |