diff options
| author | Dāvis Mosāns <davispuh@gmail.com> | 2015-08-21 07:29:22 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-15 12:51:52 -0500 |
| commit | bcb7da0b05d0a255ffad962231e0b5a925d733ae (patch) | |
| tree | f91214b2fdf12035401785f64de2944d05568534 | |
| parent | f5fda0993ccdfd54e5f696f9e09e068baafe1ff8 (diff) | |
| download | lwn-bcb7da0b05d0a255ffad962231e0b5a925d733ae.tar.gz lwn-bcb7da0b05d0a255ffad962231e0b5a925d733ae.zip | |
mvsas: Fix NULL pointer dereference in mvs_slot_task_free
[ Upstream commit 2280521719e81919283b82902ac24058f87dfc1b ]
When pci_pool_alloc fails in mvs_task_prep then task->lldd_task stays
NULL but it's later used in mvs_abort_task as slot which is passed
to mvs_slot_task_free causing NULL pointer dereference.
Just return from mvs_slot_task_free when passed with NULL slot.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=101891
Signed-off-by: Dāvis Mosāns <davispuh@gmail.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/scsi/mvsas/mv_sas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 0eb2da8a696f..89215d44d83f 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -988,6 +988,8 @@ static void mvs_slot_free(struct mvs_info *mvi, u32 rx_desc) static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task, struct mvs_slot_info *slot, u32 slot_idx) { + if (!slot) + return; if (!slot->task) return; if (!sas_protocol_ata(task->task_proto)) |