]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: liquidio: Fix off-by-one error in PF setup_nic_devices() cleanup
authorZilin Guan <zilin@seu.edu.cn>
Wed, 28 Jan 2026 15:44:39 +0000 (15:44 +0000)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Jan 2026 03:27:35 +0000 (19:27 -0800)
In setup_nic_devices(), the initialization loop jumps to the label
setup_nic_dev_free on failure. The current cleanup loop while(i--)
skip the failing index i, causing a memory leak.

Fix this by changing the loop to iterate from the current index i
down to 0.

Also, decrement i in the devlink_alloc failure path to point to the
last successfully allocated index.

Compile tested only. Issue found using code review.

Fixes: f21fb3ed364b ("Add support of Cavium Liquidio ethernet adapters")
Suggested-by: Simon Horman <horms@kernel.org>
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20260128154440.278369-3-zilin@seu.edu.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cavium/liquidio/lio_main.c

index 1f10b1b22a1e4ad9c616f75c5817d53965d276c9..c1a3df2252549283ac255219d34cf4d421cb6c75 100644 (file)
@@ -3750,6 +3750,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
        if (!devlink) {
                device_unlock(&octeon_dev->pci_dev->dev);
                dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n");
+               i--;
                goto setup_nic_dev_free;
        }
 
@@ -3765,11 +3766,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
 setup_nic_dev_free:
 
-       while (i--) {
+       do {
                dev_err(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup failed\n", i);
                liquidio_destroy_nic_device(octeon_dev, i);
-       }
+       } while (i--);
 
 setup_nic_dev_done: