From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: jiri@mellanox.com, idosch@mellanox.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr> Subject: [PATCH] mlxsw: core: Fix an error handling path in 'mlxsw_core_bus_device_register()' Date: Thu, 10 May 2018 13:26:16 +0200 [thread overview] Message-ID: <20180510112616.20508-1-christophe.jaillet@wanadoo.fr> (raw) Resources are not freed in the reverse order of the allocation. Labels are also mixed-up. Fix it and reorder code and labels in the error handling path of 'mlxsw_core_bus_device_register()' Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Please review carefully. This patch is proposed because it triggers one of my coccinelle scripts. I'm not 100% sure if correct. The script tries to spot wrongly ordered error handling path. It is: @@ identifier l1, l2; @@ if (...) { ... * goto l1; } ... if (...) { ... * goto l2; } ... *l1: ... *l2: ... --- drivers/net/ethernet/mellanox/mlxsw/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 93ea56620a24..e13ac3b8dff7 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1100,11 +1100,11 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, err_alloc_lag_mapping: mlxsw_ports_fini(mlxsw_core); err_ports_init: - mlxsw_bus->fini(bus_priv); -err_bus_init: if (!reload) devlink_resources_unregister(devlink, NULL); err_register_resources: + mlxsw_bus->fini(bus_priv); +err_bus_init: if (!reload) devlink_free(devlink); err_devlink_alloc: -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: jiri@mellanox.com, idosch@mellanox.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr> Subject: [PATCH] mlxsw: core: Fix an error handling path in 'mlxsw_core_bus_device_register()' Date: Thu, 10 May 2018 11:26:16 +0000 [thread overview] Message-ID: <20180510112616.20508-1-christophe.jaillet@wanadoo.fr> (raw) Resources are not freed in the reverse order of the allocation. Labels are also mixed-up. Fix it and reorder code and labels in the error handling path of 'mlxsw_core_bus_device_register()' Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Please review carefully. This patch is proposed because it triggers one of my coccinelle scripts. I'm not 100% sure if correct. The script tries to spot wrongly ordered error handling path. It is: @@ identifier l1, l2; @@ if (...) { ... * goto l1; } ... if (...) { ... * goto l2; } ... *l1: ... *l2: ... --- drivers/net/ethernet/mellanox/mlxsw/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 93ea56620a24..e13ac3b8dff7 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1100,11 +1100,11 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, err_alloc_lag_mapping: mlxsw_ports_fini(mlxsw_core); err_ports_init: - mlxsw_bus->fini(bus_priv); -err_bus_init: if (!reload) devlink_resources_unregister(devlink, NULL); err_register_resources: + mlxsw_bus->fini(bus_priv); +err_bus_init: if (!reload) devlink_free(devlink); err_devlink_alloc: -- 2.17.0
next reply other threads:[~2018-05-10 11:26 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-10 11:26 Christophe JAILLET [this message] 2018-05-10 11:26 ` [PATCH] mlxsw: core: Fix an error handling path in 'mlxsw_core_bus_device_register()' Christophe JAILLET 2018-05-10 11:58 ` Ido Schimmel 2018-05-10 11:58 ` Ido Schimmel 2018-05-11 15:57 ` David Miller 2018-05-11 15:57 ` David Miller 2018-05-10 12:41 ` Dan Carpenter 2018-05-10 12:41 ` Dan Carpenter 2018-05-10 13:08 ` [PATCH] mlxsw: core: Fix an error handling path in \'mlxsw_core_bus_device_register()\' Arkadi Sharshevsky 2018-05-10 13:17 ` Dan Carpenter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180510112616.20508-1-christophe.jaillet@wanadoo.fr \ --to=christophe.jaillet@wanadoo.fr \ --cc=davem@davemloft.net \ --cc=idosch@mellanox.com \ --cc=jiri@mellanox.com \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.