| Message ID | 20201212182005.120437-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4375ada01963d1ebf733d60d1bb6e5db401e1ac6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: bcmgenet: Fix a resource leak in an error handling path in the probe functin | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 12/12/2020 10:20 AM, Christophe JAILLET wrote: > If the 'register_netdev()' call fails, we must undo a previous > 'bcmgenet_mii_init()' call. > > Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file")> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > The missing 'bcmgenet_mii_exit()' call is added here, instead of in the > error handling path in order to avoid some goto spaghetti code. Yes that makes sense, thanks!
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Sat, 12 Dec 2020 19:20:05 +0100 you wrote: > If the 'register_netdev()' call fails, we must undo a previous > 'bcmgenet_mii_init()' call. > > Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > The missing 'bcmgenet_mii_exit()' call is added here, instead of in the > error handling path in order to avoid some goto spaghetti code. > > [...] Here is the summary with links: - net: bcmgenet: Fix a resource leak in an error handling path in the probe functin https://git.kernel.org/netdev/net/c/4375ada01963 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index be85dad2e3bc..fcca023f22e5 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -4069,8 +4069,10 @@ static int bcmgenet_probe(struct platform_device *pdev) clk_disable_unprepare(priv->clk); err = register_netdev(dev); - if (err) + if (err) { + bcmgenet_mii_exit(dev); goto err; + } return err;
If the 'register_netdev()' call fails, we must undo a previous 'bcmgenet_mii_init()' call. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- The missing 'bcmgenet_mii_exit()' call is added here, instead of in the error handling path in order to avoid some goto spaghetti code. --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)