From:   Thomas Gleixner <tglx@linutronix.de>
To:     Marc Zyngier <maz@kernel.org>,
        "Russell King (Oracle)" <linux@armlinux.org.uk>
Cc:     LKML <linux-kernel@vger.kernel.org>, x86@kernel.org,
        Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
        linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jason Gunthorpe <jgg@mellanox.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Alex Williamson <alex.williamson@redhat.com>,
        Kevin Tian <kevin.tian@intel.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        Ashok Raj <ashok.raj@intel.com>, Jon Mason <jdmason@kudzu.us>,
        Allen Hubbe <allenbh@gmail.com>
Subject: Re: [REGRESSION] Re: [patch V3 09/33] genirq/msi: Add range
 checking to msi_insert_desc()
In-Reply-To: <86fsb0xkaa.wl-maz@kernel.org>
References: <20221124230505.073418677@linutronix.de>
 <20221124232325.798556374@linutronix.de>
 <Y/Opu6ETe3ZzZ/8E@shell.armlinux.org.uk> <86fsb0xkaa.wl-maz@kernel.org>
Date:   Mon, 20 Feb 2023 19:43:24 +0100
Message-ID: <87y1osp48j.ffs@tglx>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

On Mon, Feb 20 2023 at 18:29, Marc Zyngier wrote:
> diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
> index 783a3e6a0b10..13d96495e6d0 100644
> --- a/kernel/irq/msi.c
> +++ b/kernel/irq/msi.c
> @@ -1084,10 +1084,13 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
>  	struct xarray *xa;
>  	int ret, virq;
>  
> -	if (!msi_ctrl_valid(dev, &ctrl))
> -		return -EINVAL;
> -
>  	msi_lock_descs(dev);
> +
> +	if (!msi_ctrl_valid(dev, &ctrl)) {
> +		ret = -EINVAL;
> +		goto unlock;
> +	}
> +
>  	ret = msi_domain_add_simple_msi_descs(dev, &ctrl);
>  	if (ret)
>  		goto unlock;

Yup, you beat me by a minute :)