From nobody Tue Jun 30 23:32:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9B4EC433FE for ; Thu, 6 Jan 2022 11:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238651AbiAFLsN (ORCPT ); Thu, 6 Jan 2022 06:48:13 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:16187 "EHLO relmlie6.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238456AbiAFLsM (ORCPT ); Thu, 6 Jan 2022 06:48:12 -0500 X-IronPort-AV: E=Sophos;i="5.88,266,1635174000"; d="scan'208";a="106230362" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 06 Jan 2022 20:48:11 +0900 Received: from localhost.localdomain (unknown [10.226.36.204]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 9A3BF425C76E; Thu, 6 Jan 2022 20:48:08 +0900 (JST) From: Lad Prabhakar To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Jakub Kicinski , Biju Das , Lad Prabhakar Cc: Pavel Machek , linux-renesas-soc@vger.kernel.org, Prabhakar , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] can: rcar_canfd: Make sure we free CAN network device Date: Thu, 6 Jan 2022 11:48:00 +0000 Message-Id: <20220106114801.20563-1-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: 76e9353a80e9 ("can: rcar_canfd: Add support for RZ/G2L family") Reported-by: Pavel Machek Signed-off-by: Lad Prabhakar --- drivers/net/can/rcar/rcar_canfd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index ff9d0f5ae0dd..388521e70837 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1640,8 +1640,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd= _global *gpriv, u32 ch, ndev =3D alloc_candev(sizeof(*priv), RCANFD_FIFO_DEPTH); if (!ndev) { dev_err(&pdev->dev, "alloc_candev() failed\n"); - err =3D -ENOMEM; - goto fail; + return -ENOMEM; } priv =3D netdev_priv(ndev); =20 @@ -1735,8 +1734,8 @@ static int rcar_canfd_channel_probe(struct rcar_canfd= _global *gpriv, u32 ch, =20 fail_candev: netif_napi_del(&priv->napi); - free_candev(ndev); fail: + free_candev(ndev); return err; } =20 --=20 2.17.1