linux-kernel - [PATCH 3.4 87/92] mvsas: Fix NULL pointer dereference in mvs_slot_task

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1460976397-5688-87-git-send-email-lizf@kernel.org>
Date:	Mon, 18 Apr 2016 18:46:32 +0800
From:	lizf@...nel.org
To:	stable@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org,
	Dāvis Mosāns <davispuh@...il.com>,
	James Bottomley <JBottomley@...n.com>,
	Zefan Li <lizefan@...wei.com>
Subject: [PATCH 3.4 87/92] mvsas: Fix NULL pointer dereference in mvs_slot_task_free

From: Dāvis Mosāns <davispuh@...il.com>

3.4.112-rc1 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: Zefan Li <lizefan@...wei.com>
---
 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 dbb8edf..06da698 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -984,6 +984,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))
-- 
1.9.1