diff options
| author | Tomas Henzl <thenzl@redhat.com> | 2013-08-01 15:14:00 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-08-26 12:51:31 +0400 |
| commit | 2cc5bfaf854463d9d1aa52091f60110fbf102a96 (patch) | |
| tree | a506db6460685149054a2995770ba5b916bac2fa /drivers/scsi/hpsa.c | |
| parent | 80aebef7c112ca2610ba8aa6cd8cb02f3828e366 (diff) | |
| download | blackbird-op-linux-2cc5bfaf854463d9d1aa52091f60110fbf102a96.tar.gz blackbird-op-linux-2cc5bfaf854463d9d1aa52091f60110fbf102a96.zip | |
[SCSI] hpsa: fix a race in cmd_free/scsi_done
When the driver calls scsi_done and after that frees it's internal
preallocated memory it can happen that a new job is enqueud before
the memory is freed. The allocation fails and the message
"cmd_alloc returned NULL" is shown.
Patch below fixes it by moving cmd->scsi_done after cmd_free.
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 7f4f790a3d71..21fd2b182ec9 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -1205,8 +1205,8 @@ static void complete_scsi_command(struct CommandList *cp) scsi_set_resid(cmd, ei->ResidualCnt); if (ei->CommandStatus == 0) { - cmd->scsi_done(cmd); cmd_free(h, cp); + cmd->scsi_done(cmd); return; } @@ -1379,8 +1379,8 @@ static void complete_scsi_command(struct CommandList *cp) dev_warn(&h->pdev->dev, "cp %p returned unknown status %x\n", cp, ei->CommandStatus); } - cmd->scsi_done(cmd); cmd_free(h, cp); + cmd->scsi_done(cmd); } static void hpsa_pci_unmap(struct pci_dev *pdev, |
