* [PATCH] net: hinic: Fix error handling in hinic_module_init()
@ 2022-11-09 11:23 Yuan Can
2022-11-09 17:56 ` Francois Romieu
0 siblings, 1 reply; 3+ messages in thread
From: Yuan Can @ 2022-11-09 11:23 UTC (permalink / raw
To: davem, edumazet, kuba, pabeni, mqaio, shaozhengchao,
christophe.jaillet, gustavoars, luobin9, netdev
Cc: yuancan
A problem about hinic create debugfs failed is triggered with the
following log given:
[ 931.419023] debugfs: Directory 'hinic' with parent '/' already present!
The reason is that hinic_module_init() returns pci_register_driver()
directly without checking its return value, if pci_register_driver()
failed, it returns without destroy the newly created debugfs, resulting
the debugfs of hinic can never be created later.
hinic_module_init()
hinic_dbg_register_debugfs() # create debugfs directory
pci_register_driver()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without destroy debugfs directory
Fix by removing debugfs when pci_register_driver() returns error.
Fixes: 253ac3a97921 ("hinic: add support to query sq info")
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
drivers/net/ethernet/huawei/hinic/hinic_main.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
index e1f54a2f28b2..b2fcd83d58fa 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
@@ -1474,8 +1474,17 @@ static struct pci_driver hinic_driver = {
static int __init hinic_module_init(void)
{
+ int ret;
+
hinic_dbg_register_debugfs(HINIC_DRV_NAME);
- return pci_register_driver(&hinic_driver);
+
+ ret = pci_register_driver(&hinic_driver);
+ if (ret) {
+ hinic_dbg_unregister_debugfs();
+ return ret;
+ }
+
+ return 0;
}
static void __exit hinic_module_exit(void)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: hinic: Fix error handling in hinic_module_init()
2022-11-09 11:23 [PATCH] net: hinic: Fix error handling in hinic_module_init() Yuan Can
@ 2022-11-09 17:56 ` Francois Romieu
2022-11-10 2:00 ` Yuan Can
0 siblings, 1 reply; 3+ messages in thread
From: Francois Romieu @ 2022-11-09 17:56 UTC (permalink / raw
To: Yuan Can
Cc: davem, edumazet, kuba, pabeni, mqaio, shaozhengchao,
christophe.jaillet, gustavoars, luobin9, netdev
Yuan Can <yuancan@huawei.com> :
[...]
> diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> index e1f54a2f28b2..b2fcd83d58fa 100644
> --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
> +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> @@ -1474,8 +1474,17 @@ static struct pci_driver hinic_driver = {
>
> static int __init hinic_module_init(void)
> {
> + int ret;
> +
> hinic_dbg_register_debugfs(HINIC_DRV_NAME);
> - return pci_register_driver(&hinic_driver);
> +
> + ret = pci_register_driver(&hinic_driver);
> + if (ret) {
> + hinic_dbg_unregister_debugfs();
> + return ret;
> + }
> +
> + return 0;
> }
You can remove some fat:
ret = pci_register_driver(&hinic_driver);
if (ret)
hinic_dbg_unregister_debugfs();
return ret;
--
Ueimor
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: hinic: Fix error handling in hinic_module_init()
2022-11-09 17:56 ` Francois Romieu
@ 2022-11-10 2:00 ` Yuan Can
0 siblings, 0 replies; 3+ messages in thread
From: Yuan Can @ 2022-11-10 2:00 UTC (permalink / raw
To: Francois Romieu
Cc: davem, edumazet, kuba, pabeni, mqaio, shaozhengchao,
christophe.jaillet, gustavoars, luobin9, netdev
在 2022/11/10 1:56, Francois Romieu 写道:
> Yuan Can <yuancan@huawei.com> :
> [...]
>> diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
>> index e1f54a2f28b2..b2fcd83d58fa 100644
>> --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
>> +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
>> @@ -1474,8 +1474,17 @@ static struct pci_driver hinic_driver = {
>>
>> static int __init hinic_module_init(void)
>> {
>> + int ret;
>> +
>> hinic_dbg_register_debugfs(HINIC_DRV_NAME);
>> - return pci_register_driver(&hinic_driver);
>> +
>> + ret = pci_register_driver(&hinic_driver);
>> + if (ret) {
>> + hinic_dbg_unregister_debugfs();
>> + return ret;
>> + }
>> +
>> + return 0;
>> }
> You can remove some fat:
>
> ret = pci_register_driver(&hinic_driver);
> if (ret)
> hinic_dbg_unregister_debugfs();
>
> return ret;
Thanks for the suggestion! I will change to this style.
--
Best regards,
Yuan Can
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-10 2:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-09 11:23 [PATCH] net: hinic: Fix error handling in hinic_module_init() Yuan Can
2022-11-09 17:56 ` Francois Romieu
2022-11-10 2:00 ` Yuan Can
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.