mvsas: Fix NULL pointer dereference in mvs_slot_task_free
authorDāvis Mosāns <davispuh@gmail.com>
Fri, 21 Aug 2015 04:29:22 +0000 (07:29 +0300)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 15 Nov 2015 17:51:52 +0000 (12:51 -0500)
[ 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>
drivers/scsi/mvsas/mv_sas.c

index 0eb2da8a696fe0c5d14a182022edf4ad76c91d10..89215d44d83fa9d4b3e1083b6a3e2cfb9b60428c 100644 (file)
@@ -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))