2019-08-29 02:48:14

by Yue Haibing

Subject: [PATCH] amd-xgbe: Fix error path in xgbe_mod_init()

In xgbe_mod_init(), we should do cleanup if some error occurs

Reported-by: Hulk Robot <[email protected]>
Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming")
Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index b41f236..7ce9c69 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void)

ret = xgbe_platform_init();
if (ret)
- return ret;
+ goto err_platform_init;

ret = xgbe_pci_init();
if (ret)
- return ret;
+ goto err_pci_init;

return 0;
+
+err_pci_init:
+ xgbe_platform_exit();
+err_platform_init:
+ unregister_netdevice_notifier(&xgbe_netdev_notifier);
+ return ret;
}

static void __exit xgbe_mod_exit(void)
--
1.8.3.1

2019-08-29 17:55:33

by Jakub Kicinski

Subject: Re: [PATCH] amd-xgbe: Fix error path in xgbe_mod_init()

On Thu, 29 Aug 2019 10:46:00 +0800, YueHaibing wrote:
> In xgbe_mod_init(), we should do cleanup if some error occurs
>
> Reported-by: Hulk Robot <[email protected]>
> Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming")
> Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support")
> Signed-off-by: YueHaibing <[email protected]>

Looks correct.

For networking fixes please try to use [PATCH net] as a tag ([PATCH
net-next] for normal, non-fix patches).

2019-08-30 01:41:37

by Yue Haibing

Subject: Re: [PATCH] amd-xgbe: Fix error path in xgbe_mod_init()

On 2019/8/30 1:52, Jakub Kicinski wrote:
> On Thu, 29 Aug 2019 10:46:00 +0800, YueHaibing wrote:
>> In xgbe_mod_init(), we should do cleanup if some error occurs
>>
>> Reported-by: Hulk Robot <[email protected]>
>> Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming")
>> Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support")
>> Signed-off-by: YueHaibing <[email protected]>
>
> Looks correct.

Thanks!
>
> For networking fixes please try to use [PATCH net] as a tag ([PATCH
> net-next] for normal, non-fix patches).

Ok.
>
>

2019-08-30 21:16:59

by David Miller

Subject: Re: [PATCH] amd-xgbe: Fix error path in xgbe_mod_init()

From: YueHaibing <[email protected]>
Date: Thu, 29 Aug 2019 10:46:00 +0800

> In xgbe_mod_init(), we should do cleanup if some error occurs
>
> Reported-by: Hulk Robot <[email protected]>
> Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming")
> Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support")
> Signed-off-by: YueHaibing <[email protected]>

Applied.