lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 170/849] cxl/pci: Fix NULL vs ERR_PTR confusion
    Date
    From: Dan Williams <dan.j.williams@intel.com>

    commit ca76a3a8052b71c0334d5c094859cfa340c290a8 upstream.

    cxl_pci_map_regblock() may return an ERR_PTR(), but cxl_pci_setup_regs()
    is only prepared for NULL as the error case. Pick the minimal fix for
    -stable backport purposes and just have cxl_pci_map_regblock() return
    NULL for errors.

    Fixes: f8a7e8c29be8 ("cxl/pci: Reserve all device regions at once")
    Cc: <stable@vger.kernel.org>
    Reviewed-by: Ira Weiny <ira.weiny@intel.com>
    Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Link: https://lore.kernel.org/r/163433325724.834522.17809774578178224149.stgit@dwillia2-desk3.amr.corp.intel.com
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/cxl/pci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/cxl/pci.c
    +++ b/drivers/cxl/pci.c
    @@ -970,7 +970,7 @@ static void __iomem *cxl_mem_map_regbloc
    if (pci_resource_len(pdev, bar) < offset) {
    dev_err(dev, "BAR%d: %pr: too small (offset: %#llx)\n", bar,
    &pdev->resource[bar], (unsigned long long)offset);
    - return IOMEM_ERR_PTR(-ENXIO);
    + return NULL;
    }

    addr = pci_iomap(pdev, bar, 0);

    \
     
     \ /
      Last update: 2021-11-15 23:04    [W:2.409 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site