Intel-Wired-Lan Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: Shang XiaoJing <shangxiaojing@huawei.com>,
	<jesse.brandeburg@intel.com>, <davem@davemloft.net>,
	<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
	<jeffrey.t.kirsher@intel.com>, <shannon.nelson@intel.com>,
	<intel-wired-lan@lists.osuosl.org>, <netdev@vger.kernel.org>
Subject: Re: [Intel-wired-lan] [PATCH] i40e: Fix error handling in i40e_init_module()
Date: Tue, 15 Nov 2022 11:04:16 -0800	[thread overview]
Message-ID: <48014a1c-9fec-1bc9-ea81-9611bce742fd@intel.com> (raw)
In-Reply-To: <20221114011022.25127-1-shangxiaojing@huawei.com>

On 11/13/2022 5:10 PM, Shang XiaoJing wrote:
> i40e_init_module() won't free the debugfs directory created by
> i40e_dbg_init() when pci_register_driver() failed. Add fail path to
> call i40e_dbg_exit() to remove the debugfs entries to prevent the bug.
> 
> i40e: Intel(R) Ethernet Connection XL710 Network Driver
> i40e: Copyright (c) 2013 - 2019 Intel Corporation.
> debugfs: Directory 'i40e' with parent '/' already present!
> 
> Fixes: 41c445ff0f48 ("i40e: main driver core")
> Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
> ---
>   drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index b5dcd15ced36..828669ea946e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -16644,6 +16644,8 @@ static struct pci_driver i40e_driver = {
>    **/
>   static int __init i40e_init_module(void)
>   {
> +	int err;
> +
>   	pr_info("%s: %s\n", i40e_driver_name, i40e_driver_string);
>   	pr_info("%s: %s\n", i40e_driver_name, i40e_copyright);
>   
> @@ -16661,7 +16663,13 @@ static int __init i40e_init_module(void)
>   	}
>   
>   	i40e_dbg_init();
> -	return pci_register_driver(&i40e_driver);
> +	err = pci_register_driver(&i40e_driver);
> +	if (err) {
> +		i40e_dbg_exit();

For fail path, the workqueue needs to be destroyed as well.

> +		return err;
> +	}
> +
> +	return 0;
>   }
>   module_init(i40e_init_module);
>   
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

  reply	other threads:[~2022-11-15 19:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-14  1:10 [Intel-wired-lan] [PATCH] i40e: Fix error handling in i40e_init_module() Shang XiaoJing
2022-11-15 19:04 ` Tony Nguyen [this message]
2022-11-16  1:01   ` shangxiaojing

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=48014a1c-9fec-1bc9-ea81-9611bce742fd@intel.com \
    --to=anthony.l.nguyen@intel.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=jesse.brandeburg@intel.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shangxiaojing@huawei.com \
    --cc=shannon.nelson@intel.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox