Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220409062449.3752252-1-zheyuma97@gmail.com>
In-Reply-To: <20220409062449.3752252-1-zheyuma97@gmail.com>
From:   Stanislav Yakovlev <stas.yakovlev@gmail.com>
Date:   Wed, 13 Apr 2022 14:39:54 -0400
Message-ID: <CA++WF2Np7Bk_qT68Uc3mrC38mN5p3fm9eVT7VA8NoX6=es2r2w@mail.gmail.com>
Subject: Re: [PATCH] wireless: ipw2x00: Refine the error handling of ipw2100_pci_init_one()
To:     Zheyu Ma <zheyuma97@gmail.com>
Cc:     kvalo@kernel.org, "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, pabeni@redhat.com,
        wireless <linux-wireless@vger.kernel.org>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sat, 9 Apr 2022 at 02:25, Zheyu Ma <zheyuma97@gmail.com> wrote:
>
> The driver should release resources in reverse order, i.e., the
> resources requested first should be released last, and the driver
> should adjust the order of error handling code by this rule.
>
> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
> ---
>  drivers/net/wireless/intel/ipw2x00/ipw2100.c | 34 +++++++++-----------
>  1 file changed, 16 insertions(+), 18 deletions(-)
>
[Skipped]

> @@ -6306,9 +6303,13 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
>  out:
>         return err;
>
> -      fail_unlock:
> +fail_unlock:
>         mutex_unlock(&priv->action_mutex);
> -      fail:
> +fail:
> +       pci_release_regions(pci_dev);
> +fail_disable:
> +       pci_disable_device(pci_dev);
We can't move these functions before the following block.

> +fail_dev:
>         if (dev) {
>                 if (registered >= 2)
>                         unregister_netdev(dev);
This block continues with a function call to ipw2100_hw_stop_adapter
which assumes that device is still accessible via pci bus.

> @@ -6334,11 +6335,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
>
>                 free_libipw(dev, 0);
>         }
> -
> +fail_iounmap:
>         pci_iounmap(pci_dev, ioaddr);
> -
> -       pci_release_regions(pci_dev);
> -       pci_disable_device(pci_dev);
>         goto out;
>  }
>
> --
> 2.25.1
>

Stanislav.