Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3124506pxb; Fri, 12 Feb 2021 09:44:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvtvJsUnQOlbj/xWJae0z683emI+os3KAJC6eNxWCvRF6wXM2+d/gr9IVYG2PyyoBoQM/Y X-Received: by 2002:a05:6402:1c0f:: with SMTP id ck15mr4377848edb.16.1613151891363; Fri, 12 Feb 2021 09:44:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613151891; cv=none; d=google.com; s=arc-20160816; b=x10L0joi6Xb6reewhx9bbusuEkgLKhWvOxToaNjeTA1Xw3wWiTWqBIzz6ndP1KsjKu p3gZbJhiS5yTrskhtI96siqabJIL1J73uAybIPN0NZ77yy7tBEwjHSHyW5zz1EfrwHn2 UKm+nNUczF842lV9iS79YMipuLOjQ73+SBVsmQJrJyO4GMqJYWOH6Po7hZ79/Y20RNC7 uqHqqTZ6J5iuZIskEjD/L4xzf01iFG6ZUpGQgTiUOGyF879hYbW5SqnOhSkdBJv1G+v7 8jzk/1mIgSZg8Qi41GBEpiR5JQBAUpOmqtuzq+uuFPML5C7cS+J2cWq3yK6Zeux1xRMQ ISsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=BVkqY6OPwiSXuM+6JUqMuCyRPsT169+eI1raQGj+DIM=; b=LaZUURec3HetjhYBJSuDCdsRk6opjLL2JLyIx4HGzV1JjDV5VlI5vmb4novr2yDYZl AJKOiWKyC3wntl17DMa6bJ9CQm/3bIZEMuzJYLRkNI7df7S/1eOVD63uwcaetxNcs1Ul IFgSAIwkmId7h8p4X10b8ltoQpoUyQNhOi4qVpG4oxTbzCj3Q32ruhQzl0Tw5uFNm6gq oqHv7qSk51QfxSY/1LOJLZRom67+f/jljg1M4pcKc3aONjbaWGTpNm7kQGxlBF7PS5Tp bCXxTWPnFkXpIbZJ4lKKWUXU3O8olbS5byDn8fPVGc6qiIuvpnMnm7pftDtyXNWrTwW0 Ihsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=SQPXbcH1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l13si6891754edj.219.2021.02.12.09.44.27; Fri, 12 Feb 2021 09:44:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=SQPXbcH1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbhBLRnt (ORCPT + 99 others); Fri, 12 Feb 2021 12:43:49 -0500 Received: from smtprelay-out1.synopsys.com ([149.117.73.133]:42880 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231665AbhBLRjM (ORCPT ); Fri, 12 Feb 2021 12:39:12 -0500 Received: from mailhost.synopsys.com (mdc-mailhost1.synopsys.com [10.225.0.209]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtprelay-out1.synopsys.com (Postfix) with ESMTPS id 97FE040C7B; Fri, 12 Feb 2021 17:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1613151492; bh=72Sja5KwGGKlDLBCdOJNht7/ylko2TEKcoumQMOKlvI=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=SQPXbcH10secXkY1L3DG3Fv/A+S0kQIsRF/FMC0nLWhtK4jVGFeNayGd6TM8Wa9rH RBZ67B51drvOiHivCknVmJEQN01E5oT+91FMYws9ABq9EcRkinxbwtYddVDFntcTfx c1VXCp4ETpubG0kQiD04Aq06Da5cufzpzeiaZwJLsQy8DV5WfphqFClrHEq0I7+z3k zUgsd44sO/0xtqwZ+F4MSP5nUiZOZyUQERYhNdtyeFM0NrDJ/rfYrylubowHXeqvE5 ukDKKRXwOfcFxLvgo1SN/JZZe20PhJ5m2N+/cKfv3/Q4LQUFYoiukVOQJxTT03TncF ndP+MEpZQ3QcA== Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by mailhost.synopsys.com (Postfix) with ESMTP id 689C7A005C; Fri, 12 Feb 2021 17:38:11 +0000 (UTC) X-SNPS-Relay: synopsys.com From: Gustavo Pimentel To: dmaengine@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul , Dan Williams , Bjorn Helgaas , Gustavo Pimentel Subject: [PATCH v6 15/15] dmaengine: dw-edma: Add pcim_iomap_table return check Date: Fri, 12 Feb 2021 18:37:50 +0100 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, is missing a null check on a pcim_iomap_table() return value and this can lead to a null pointer dereference if the desired BAR wasn't mapped previously. Fix this by adding a null check and returning -ENOMEM. Addresses-Coverity: ("Dereference null return") Signed-off-by: Gustavo Pimentel --- drivers/dma/dw-edma/dw-edma-pcie.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c index 502de71..70d0d08 100644 --- a/drivers/dma/dw-edma/dw-edma-pcie.c +++ b/drivers/dma/dw-edma/dw-edma-pcie.c @@ -238,6 +238,9 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, dw->rd_ch_cnt = vsec_data.rd_ch_cnt; dw->rg_region.vaddr = pcim_iomap_table(pdev)[vsec_data.rg.bar]; + if (!dw->rg_region.vaddr) + return -ENOMEM; + dw->rg_region.vaddr += vsec_data.rg.off; dw->rg_region.paddr = pdev->resource[vsec_data.rg.bar].start; dw->rg_region.paddr += vsec_data.rg.off; @@ -250,12 +253,18 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, struct dw_edma_block *dt_block = &vsec_data.dt_wr[i]; ll_region->vaddr = pcim_iomap_table(pdev)[ll_block->bar]; + if (!ll_region->vaddr) + return -ENOMEM; + ll_region->vaddr += ll_block->off; ll_region->paddr = pdev->resource[ll_block->bar].start; ll_region->paddr += ll_block->off; ll_region->sz = ll_block->sz; dt_region->vaddr = pcim_iomap_table(pdev)[dt_block->bar]; + if (!dt_region->vaddr) + return -ENOMEM; + dt_region->vaddr += dt_block->off; dt_region->paddr = pdev->resource[dt_block->bar].start; dt_region->paddr += dt_block->off; @@ -269,12 +278,18 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, struct dw_edma_block *dt_block = &vsec_data.dt_rd[i]; ll_region->vaddr = pcim_iomap_table(pdev)[ll_block->bar]; + if (!ll_region->vaddr) + return -ENOMEM; + ll_region->vaddr += ll_block->off; ll_region->paddr = pdev->resource[ll_block->bar].start; ll_region->paddr += ll_block->off; ll_region->sz = ll_block->sz; dt_region->vaddr = pcim_iomap_table(pdev)[dt_block->bar]; + if (!dt_region->vaddr) + return -ENOMEM; + dt_region->vaddr += dt_block->off; dt_region->paddr = pdev->resource[dt_block->bar].start; dt_region->paddr += dt_block->off; -- 2.7.4