[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <c5891c0838328d666faff93daf46731bf85b9cc2.1448283890.git.jslaby@suse.cz>
Date: Mon, 23 Nov 2015 14:08:45 +0100
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Dāvis Mosāns <davispuh@...il.com>,
James Bottomley <JBottomley@...n.com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 23/72] mvsas: Fix NULL pointer dereference in mvs_slot_task_free
From: Dāvis Mosāns <davispuh@...il.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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@...il.com>
Reviewed-by: Tomas Henzl <thenzl@...hat.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@...e.de>
Signed-off-by: James Bottomley <JBottomley@...n.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
drivers/scsi/mvsas/mv_sas.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 1aa2a8cbb4df..783288db47c0 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))
--
2.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists