]> git.baikalelectronics.ru Git - kernel.git/commitdiff
can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
authorLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Thu, 6 Jan 2022 11:48:00 +0000 (11:48 +0000)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 9 Jan 2022 12:32:28 +0000 (13:32 +0100)
Make sure we free CAN network device in the error path. There are
several jumps to fail label after allocating the CAN network device
successfully. This patch places the free_candev() under fail label so
that in failure path a jump to fail label frees the CAN network
device.

Fixes: 53f37e24dc63 ("can: rcar_canfd: Add support for RZ/G2L family")
Link: https://lore.kernel.org/all/20220106114801.20563-1-prabhakar.mahadev-lad.rj@bp.renesas.com
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/rcar/rcar_canfd.c

index ff9d0f5ae0dd21c91412adb9b2f2103e91c5bfbf..388521e70837f7c24f9531c32f032359e41b78b5 100644 (file)
@@ -1640,8 +1640,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,
        ndev = alloc_candev(sizeof(*priv), RCANFD_FIFO_DEPTH);
        if (!ndev) {
                dev_err(&pdev->dev, "alloc_candev() failed\n");
-               err = -ENOMEM;
-               goto fail;
+               return -ENOMEM;
        }
        priv = netdev_priv(ndev);
 
@@ -1735,8 +1734,8 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,
 
 fail_candev:
        netif_napi_del(&priv->napi);
-       free_candev(ndev);
 fail:
+       free_candev(ndev);
        return err;
 }