From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752227AbcFWMhc (ORCPT ); Thu, 23 Jun 2016 08:37:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:53557 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbcFWMh2 (ORCPT ); Thu, 23 Jun 2016 08:37:28 -0400 From: Johannes Thumshirn To: "Martin K . Petersen" , James Bottomley Cc: Linux SCSI Mailinglist , Linux Kernel Mailinglist , Narsimhulu Musini , Sesidhar Baddela , Johannes Thumshirn Subject: [PATCH] snic: Fix use-after-free in case of a dma mapping error Date: Thu, 23 Jun 2016 14:37:20 +0200 Message-Id: <20160623123720.24244-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.8.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If there is a dma mapping error snic kfree()s buf right before printing it. Change the order to not accidently trip on memory that's not owned by us anymore. Signed-off-by: Johannes Thumshirn --- drivers/scsi/snic/snic_disc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c index b0fefd6..b106596 100644 --- a/drivers/scsi/snic/snic_disc.c +++ b/drivers/scsi/snic/snic_disc.c @@ -113,11 +113,11 @@ snic_queue_report_tgt_req(struct snic *snic) pa = pci_map_single(snic->pdev, buf, buf_len, PCI_DMA_FROMDEVICE); if (pci_dma_mapping_error(snic->pdev, pa)) { - kfree(buf); - snic_req_free(snic, rqi); SNIC_HOST_ERR(snic->shost, "Rpt-tgt rspbuf %p: PCI DMA Mapping Failed\n", buf); + kfree(buf); + snic_req_free(snic, rqi); ret = -EINVAL; goto error; -- 2.8.4