lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 462/772] PCI: dwc: Fix setting error return on MSI DMA mapping failure
    Date
    From: Jiantao Zhang <water.zhangjiantao@huawei.com>

    [ Upstream commit 88557685cd72cf0db686a4ebff3fad4365cb6071 ]

    When dma_mapping_error() returns error because of no enough memory,
    but dw_pcie_host_init() returns success, which will mislead the callers.

    Link: https://lore.kernel.org/r/30170911-0e2f-98ce-9266-70465b9073e5@huawei.com
    Fixes: 07940c369a6b ("PCI: dwc: Fix MSI page leakage in suspend/resume")
    Signed-off-by: Jianrong Zhang <zhangjianrong5@huawei.com>
    Signed-off-by: Jiantao Zhang <water.zhangjiantao@huawei.com>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
    index f4755f3a03be..9dcb51728dd1 100644
    --- a/drivers/pci/controller/dwc/pcie-designware-host.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
    @@ -390,7 +390,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
    sizeof(pp->msi_msg),
    DMA_FROM_DEVICE,
    DMA_ATTR_SKIP_CPU_SYNC);
    - if (dma_mapping_error(pci->dev, pp->msi_data)) {
    + ret = dma_mapping_error(pci->dev, pp->msi_data);
    + if (ret) {
    dev_err(pci->dev, "Failed to map MSI data\n");
    pp->msi_data = 0;
    goto err_free_msi;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:19    [W:4.110 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site