diff options
| author | Dāvis Mosāns <davispuh@gmail.com> | 2015-08-21 07:29:22 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-11-12 14:09:04 +0100 |
| commit | c5891c0838328d666faff93daf46731bf85b9cc2 (patch) | |
| tree | 0382813252610ee58098d0cba5f060ad350295e1 /drivers | |
| parent | bcaee63e9cbee6443f8e87ae64ea0ea982dd0279 (diff) | |
| download | lwn-c5891c0838328d666faff93daf46731bf85b9cc2.tar.gz lwn-c5891c0838328d666faff93daf46731bf85b9cc2.zip | |
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -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 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)) |