[PATCH] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

[PATCH] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

[Vladimir Zapolskiy]

Out of memory situation on driver's probe is expected to be reported to
the driver's framework with a proper -ENOMEM error code.

Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support")
Signed-off-by: Vladimir Zapolskiy <vz@kernel.org>
---
 drivers/dma/hisi_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c
index 28bf818f9aa6..c751a2e49e6d 100644
--- a/drivers/dma/hisi_dma.c
+++ b/drivers/dma/hisi_dma.c
@@ -983,7 +983,7 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	hdma_dev = devm_kzalloc(dev, struct_size(hdma_dev, chan, chan_num),
 				GFP_KERNEL);
 	if (!hdma_dev)
-		return -EINVAL;
+		return -ENOMEM;
 
 	hdma_dev->base = pcim_iomap_table(pdev)[PCI_BAR_2];
 	hdma_dev->pdev = pdev;
-- 
2.51.0

Re: [PATCH] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 5 potential issue(s) to consider:

Pre-existing issues:
- [High] IRQ handler is registered before channel state and locks are initialized.
- [High] terminate_all fails to abort ongoing DMA transfer in hardware, causing memory corruption.
- [High] hisi_dma_irq blindly assumes interrupts indicate completion without validating the VALID_BIT.
- [High] Tasklet can be scheduled after being killed during device unbind or probe failure due to incorrect devres teardown ordering.
- [Medium] Missing explicit pci_free_irq_vectors() in probe error paths.
--

commit 9e9e45695edfd75e6c95dac5980f5bcc1c7e1a68
Author: Vladimir Zapolskiy <vz@kernel.org>

dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

Out of memory situation on driver's probe is expected to be reported to
the driver's framework with a proper -ENOMEM error code.

> diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c
> index 28bf818f9aa63..c751a2e49e6dc 100644
> --- a/drivers/dma/hisi_dma.c
> +++ b/drivers/dma/hisi_dma.c
> @@ -983,7 +983,7 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	hdma_dev = devm_kzalloc(dev, struct_size(hdma_dev, chan, chan_num),
>  				GFP_KERNEL);
>  	if (!hdma_dev)
> -		return -EINVAL;
> +		return -ENOMEM;
>  
>  	hdma_dev->base = pcim_iomap_table(pdev)[PCI_BAR_2];
>  	hdma_dev->pdev = pdev;

[Severity: Medium]
This is a pre-existing issue, but I noticed that later in hisi_dma_probe(),
if an error occurs after successfully allocating IRQ vectors, the vectors
might be leaked.

For example, if hisi_dma_enable_hw_channels() fails:

    drivers/dma/hisi_dma.c:hisi_dma_probe() {
        ...
        ret = pci_alloc_irq_vectors(pdev, msi_num, msi_num, PCI_IRQ_MSI);
        if (ret < 0) {
            ...
        }
        ...
        ret = hisi_dma_enable_hw_channels(hdma_dev);
        if (ret < 0) {
            dev_err(dev, "failed to enable hw channel!\n");
            return ret;
        }
        ...
    }

The function returns without explicitly calling pci_free_irq_vectors().
Since the PCI subsystem rules require every error path after a successful
allocation to explicitly clean up before returning, does this leak IRQ
resources?

[Severity: High]
This isn't a bug introduced by this patch, but does the sequence in
hisi_dma_enable_hw_channels() create a window for a NULL pointer
dereference?

The function requests the IRQ before enabling and initializing the queue
structures:

    drivers/dma/hisi_dma.c:hisi_dma_enable_hw_channels() {
        ...
        ret = hisi_dma_request_qps_irq(hdma_dev);
        if (ret) {
            dev_err(&hdma_dev->pdev->dev, "fail to request qp irq!\n");
            return ret;
        }

        hisi_dma_enable_qps(hdma_dev);
        ...
    }

If a shared or spurious interrupt fires immediately after the IRQ is
registered, hisi_dma_irq() will run and attempt to access chan->vc.lock
and chan->hdma_dev before hisi_dma_enable_qps() initializes them:

    drivers/dma/hisi_dma.c:hisi_dma_irq() {
        ...
        struct hisi_dma_dev *hdma_dev = chan->hdma_dev;
        ...
        spin_lock(&chan->vc.lock);
        ...
        q_base = hdma_dev->queue_base;
        ...
    }

Could this crash the kernel?

[Severity: High]
This is a pre-existing issue, but I see a potential use-after-free risk
during device unbind or probe failure.

In hisi_dma_disable_qps(), tasklets are killed without first synchronizing
against active IRQs:

    drivers/dma/hisi_dma.c:hisi_dma_disable_qps() {
        for (i = 0; i < hdma_dev->chan_num; i++) {
            hisi_dma_disable_qp(hdma_dev, i);
            tasklet_kill(&hdma_dev->chan[i].vc.task);
        }
    }

If hisi_dma_irq() is executing concurrently on another CPU, it can call
vchan_cookie_complete() and schedule the tasklet again after tasklet_kill()
returns.

Because devres teardown runs before the IRQs are actually freed, could the
tasklet execute later and access the freed hdma_dev memory?

[Severity: High]
This isn't a bug introduced by this patch, but does
hisi_dma_terminate_all() fail to abort ongoing DMA transfers in the
hardware?

The function pauses the hardware, clears software state, and then
immediately unpauses the hardware:

    drivers/dma/hisi_dma.c:hisi_dma_terminate_all() {
        ...
        hisi_dma_pause_dma(chan->hdma_dev, chan->qp_num, true);
        if (chan->desc) {
            vchan_terminate_vdesc(&chan->desc->vd);
            chan->desc = NULL;
        }
        ...
        hisi_dma_pause_dma(chan->hdma_dev, chan->qp_num, false);
        ...
    }

Since the hardware queue doesn't appear to be reset, unpausing the engine
could resume the active transfer. If the DMA client assumes the transfer is
terminated and frees the destination buffer, could this overwrite freed
memory?

[Severity: High]
This is a pre-existing issue, but does hisi_dma_irq() assume that
interrupts indicate completion without checking the VALID_BIT?

The driver defines VALID_BIT (BIT(0)), but the interrupt handler only
checks if the status mask is STATUS_SUCC:

    drivers/dma/hisi_dma.c:hisi_dma_irq() {
        ...
        chan->cq_head = (chan->cq_head + 1) % hdma_dev->chan_depth;
        ...
        if (FIELD_GET(STATUS_MASK, cqe->w0) == STATUS_SUCC) {
            vchan_cookie_complete(&desc->vd);
            hisi_dma_start_transfer(chan);
        ...
    }

Since STATUS_SUCC is 0x0, if the hardware hasn't actually written to the
completion queue entry yet, the memory might be zero. A zeroed memory
block would pass the STATUS_SUCC check.

Could this lead to premature descriptor completion and queue
desynchronization if a spurious or error interrupt fires?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260630144214.4080302-1-vz@kernel.org?part=1

Re: [PATCH] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

[Frank Li]

On Tue, Jun 30, 2026 at 05:42:14PM +0300, Vladimir Zapolskiy wrote:
>
> Out of memory situation on driver's probe is expected to be reported to
> the driver's framework with a proper -ENOMEM error code.
>
> Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support")
> Signed-off-by: Vladimir Zapolskiy <vz@kernel.org>
> ---

Reviewed-by: Frank Li <Frank.Li@nxp.com>

>  drivers/dma/hisi_dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c
> index 28bf818f9aa6..c751a2e49e6d 100644
> --- a/drivers/dma/hisi_dma.c
> +++ b/drivers/dma/hisi_dma.c
> @@ -983,7 +983,7 @@ static int hisi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>         hdma_dev = devm_kzalloc(dev, struct_size(hdma_dev, chan, chan_num),
>                                 GFP_KERNEL);
>         if (!hdma_dev)
> -               return -EINVAL;
> +               return -ENOMEM;
>
>         hdma_dev->base = pcim_iomap_table(pdev)[PCI_BAR_2];
>         hdma_dev->pdev = pdev;
> --
> 2.51.0
>

Re: [PATCH] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe

[Vinod Koul]

On Tue, 30 Jun 2026 17:42:14 +0300, Vladimir Zapolskiy wrote:
> Out of memory situation on driver's probe is expected to be reported to
> the driver's framework with a proper -ENOMEM error code.
> 
> 

Applied, thanks!

[1/1] dmaengine: hisilicon: Return -ENOMEM on dynamic memory allocation in probe
      commit: cbabdd6ce1b313b5877c7fbb2f5e2f7936564d2f

Best regards,
-- 
~Vinod