Commit 29b7cd25 authored by Nikita Shubin's avatar Nikita Shubin Committed by Vinod Koul
Browse files

dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() 



If probing fails we end up with leaking ioatdma_device and each
allocated channel.

Following kmemleak easy to reproduce by injecting an error in
ioat_alloc_chan_resources() when doing ioat_dma_self_test().

unreferenced object 0xffff888014ad5800 (size 1024): [..]
    [<ffffffff827692ca>] kmemleak_alloc+0x4a/0x80
    [<ffffffff81430600>] kmalloc_trace+0x270/0x2f0
    [<ffffffffa000b7d1>] ioat_pci_probe+0xc1/0x1c0 [ioatdma]
[..]

repeated for each ioatdma channel:

unreferenced object 0xffff8880148e5c00 (size 512): [..]
    [<ffffffff827692ca>] kmemleak_alloc+0x4a/0x80
    [<ffffffff81430600>] kmalloc_trace+0x270/0x2f0
    [<ffffffffa0009641>] ioat_enumerate_channels+0x101/0x2d0 [ioatdma]
    [<ffffffffa000b266>] ioat3_dma_probe+0x4d6/0x970 [ioatdma]
    [<ffffffffa000b891>] ioat_pci_probe+0x181/0x1c0 [ioatdma]
[..]

Fixes: bf453a0a ("dmaengine: ioat: Support in-use unbind")
Signed-off-by: default avatarNikita Shubin <n.shubin@yadro.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20240528-ioatdma-fixes-v2-3-a9f2fbe26ab1@yadro.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f0dc9fda

drivers/dma/ioat/init.c

+4 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,7 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	void __iomem * const *iomap;

	struct device *dev = &pdev->dev;

	struct ioatdma_device *device;

	unsigned int i;

	u8 version;

	int err;
@@ -1384,6 +1385,9 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	err = ioat3_dma_probe(device, ioat_dca_enabled);

	if (err) {

		for (i = 0; i < IOAT_MAX_CHANS; i++)

			kfree(device->idx[i]);

		kfree(device);

		dev_err(dev, "Intel(R) I/OAT DMA Engine init failed\n");

		return -ENODEV;

	}