diff options
author | Jan Kara <jack@suse.cz> | 2019-06-19 09:05:41 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2019-10-05 16:20:03 +0100 |
commit | a7b6e4f04e9d912d5b2a1785d00a327f7bc985d4 (patch) | |
tree | 0b0770e2f0bf52236254223784c96c88c8aa5073 /drivers/scsi | |
parent | b3975e64a785cb65743bc764ee9a89510e7f51bc (diff) | |
download | linux-stable-a7b6e4f04e9d912d5b2a1785d00a327f7bc985d4.tar.gz linux-stable-a7b6e4f04e9d912d5b2a1785d00a327f7bc985d4.tar.bz2 linux-stable-a7b6e4f04e9d912d5b2a1785d00a327f7bc985d4.zip |
scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck()
commit 240b4cc8fd5db138b675297d4226ec46594d9b3b upstream.
Once we unlock adapter->hw_lock in pvscsi_queue_lck() nothing prevents just
queued scsi_cmnd from completing and freeing the request. Thus cmd->cmnd[0]
dereference can dereference already freed request leading to kernel crashes
or other issues (which one of our customers observed). Store cmd->cmnd[0]
in a local variable before unlocking adapter->hw_lock to fix the issue.
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/vmw_pvscsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index c88e1468aad7..dfa4e1752dea 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -754,6 +754,7 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd struct pvscsi_adapter *adapter = shost_priv(host); struct pvscsi_ctx *ctx; unsigned long flags; + unsigned char op; spin_lock_irqsave(&adapter->hw_lock, flags); @@ -766,13 +767,14 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd } cmd->scsi_done = done; + op = cmd->cmnd[0]; dev_dbg(&cmd->device->sdev_gendev, - "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, cmd->cmnd[0]); + "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, op); spin_unlock_irqrestore(&adapter->hw_lock, flags); - pvscsi_kick_io(adapter, cmd->cmnd[0]); + pvscsi_kick_io(adapter, op); return 0; } |