Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: h51LH6Jg7DzPFDo98BbEpkqL6xFmW4ZoeskFGq+Ui8KXLOg0tiGWcTojB5FOcofT8AfK9D5BKI
 4rvbGBIXH9Mw==
IronPort-SDR: JY83hw1KBGRXJnKJDV1va5At2JNYZ0qNhoRorCpwtr3YGKEDKKHW+lGeu7xzCFO9KII6j+2mLK
 zjln8S7O6Pkg==
Date:   Wed, 14 Oct 2020 11:48:21 +0300
From:   Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To:     Jing Xiangfeng <jingxiangfeng@huawei.com>
Cc:     andreas.noever@gmail.com, michael.jamet@intel.com,
        mika.westerberg@linux.intel.com, YehezkelShB@gmail.com,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] thunderbolt: Add the missed ida_simple_remove() in
 ring_request_msix()
Message-ID: <20201014084821.GR4077@smile.fi.intel.com>
References: <20201014014604.167968-1-jingxiangfeng@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201014014604.167968-1-jingxiangfeng@huawei.com>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
Precedence: bulk

On Wed, Oct 14, 2020 at 09:46:04AM +0800, Jing Xiangfeng wrote:
> ring_request_msix() misses to call ida_simple_remove() in an error path.
> Add a label 'err_ida_remove' and jump to it.

...

> @@ -406,11 +406,22 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
>  	ring->vector = ret;

^^^

>  	ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);
> -	if (ring->irq < 0)
> -		return ring->irq;
> +	if (ring->irq < 0) {
> +		ret = ring->irq;
> +		goto err_ida_remove;
> +	}

What about
	ret = pci_irq_vector(ring->nhi->pdev, ring->vector);
	if (ret < 0)
		goto err_ida_remove;

	ring->irq = ret;

?

(See also context above)

>  	irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
> -	return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
> +	ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
> +	if (ret)
> +		goto err_ida_remove;
> +
> +	return 0;
> +
> +err_ida_remove:
> +	ida_simple_remove(&nhi->msix_ida, ring->vector);
> +
> +	return ret;
>  }
>  
>  static void ring_release_msix(struct tb_ring *ring)
> -- 
> 2.17.1
> 

-- 
With Best Regards,
Andy Shevchenko