summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDāvis Mosāns <davispuh@gmail.com>2015-08-21 07:29:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-09 14:33:39 -0800
commite12243dc14b81bc5c4e6e82b0b9ff9911a060a30 (patch)
tree5b20838bcadef80079ec5bf51ca6134421cbb49b
parentf37c8c0acecff7edaec3bdd5ea84765e2058edb6 (diff)
mvsas: Fix NULL pointer dereference in mvs_slot_task_free
commit 2280521719e81919283b82902ac24058f87dfc1b upstream. 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> Signed-off-by: James Bottomley <JBottomley@Odin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/scsi/mvsas/mv_sas.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 454536c49315..9c780740fb82 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -887,6 +887,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))