octeon_ep: fix potential memory leak in octep_device_setup()

When occur unsupported_dev and mbox init errors, it did not free oct->conf
and iounmap() oct->mmio[i].hw_addr. That would trigger memory leak problem.
Add kfree() for oct->conf and iounmap() for oct->mmio[i].hw_addr under
unsupported_dev and mbox init errors to fix the problem.

Fixes: 862cd659a6fb ("octeon_ep: Add driver framework and device initialization")
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 546bcebf4462d4fe68dd30dcbdaa4e49ecbf2577..53f288c32238ca5a7b53c123ca780ef6fe2349b1 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -956,7 +956,7 @@ int octep_device_setup(struct octep_device *oct)
        ret = octep_ctrl_mbox_init(ctrl_mbox);
        if (ret) {
                dev_err(&pdev->dev, "Failed to initialize control mbox\n");
-               return -1;
+               goto unsupported_dev;
        }
        oct->ctrl_mbox_ifstats_offset = OCTEP_CTRL_MBOX_SZ(ctrl_mbox->h2fq.elem_sz,
                                                           ctrl_mbox->h2fq.elem_cnt,
@@ -966,6 +966,10 @@ int octep_device_setup(struct octep_device *oct)
        return 0;
 
 unsupported_dev:
+       for (i = 0; i < OCTEP_MMIO_REGIONS; i++)
+               iounmap(oct->mmio[i].hw_addr);
+
+       kfree(oct->conf);
        return -1;
 }