[PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[John Garry]

The current check of nvec < minvec for nvec returned from
platform_irq_count() will not detect a negative error code in nvec.

This is because minvec is unsigned, and, as such, nvec is promoted to
unsigned in that check, which will make it a huge number (if it contained
-EPROBE_DEFER).

In practice, an error should not occur in nvec for the only in-tree
user, but add a check anyway.

Fixes: e15f2fa959f2 ("driver core: platform: Add devm_platform_get_irqs_affinity()")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John Garry <john.garry@huawei.com>
---
I hope that this can go through either irqchip or driver/core trees, thanks!

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 95fd1549f87d..8456d8384ac8 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -366,6 +366,8 @@ int devm_platform_get_irqs_affinity(struct platform_device *dev,
 		return -ERANGE;
 
 	nvec = platform_irq_count(dev);
+	if (nvec < 0)
+		return nvec;
 
 	if (nvec < minvec)
 		return -ENOSPC;
-- 
2.26.2

[irqchip: irq/irqchip-next] driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[irqchip-bot for John Garry]

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     e1dc20995cb9fa04b46e8f37113a7203c906d2bf
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/e1dc20995cb9fa04b46e8f37113a7203c906d2bf
Author:        John Garry <john.garry@huawei.com>
AuthorDate:    Mon, 21 Dec 2020 22:30:55 +08:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Tue, 22 Dec 2020 08:06:38 

driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

The current check of nvec < minvec for nvec returned from
platform_irq_count() will not detect a negative error code in nvec.

This is because minvec is unsigned, and, as such, nvec is promoted to
unsigned in that check, which will make it a huge number (if it contained
-EPROBE_DEFER).

In practice, an error should not occur in nvec for the only in-tree
user, but add a check anyway.

Fixes: e15f2fa959f2 ("driver core: platform: Add devm_platform_get_irqs_affinity()")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1608561055-231244-1-git-send-email-john.garry@huawei.com
---
 drivers/base/platform.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ea8add1..74c97b6 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -351,6 +351,8 @@ int devm_platform_get_irqs_affinity(struct platform_device *dev,
 		return -ERANGE;
 
 	nvec = platform_irq_count(dev);
+	if (nvec < 0)
+		return nvec;
 
 	if (nvec < minvec)
 		return -ENOSPC;

Re: [PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[Greg KH]

On Mon, Dec 21, 2020 at 10:30:55PM +0800, John Garry wrote:
> The current check of nvec < minvec for nvec returned from
> platform_irq_count() will not detect a negative error code in nvec.
> 
> This is because minvec is unsigned, and, as such, nvec is promoted to
> unsigned in that check, which will make it a huge number (if it contained
> -EPROBE_DEFER).
> 
> In practice, an error should not occur in nvec for the only in-tree
> user, but add a check anyway.
> 
> Fixes: e15f2fa959f2 ("driver core: platform: Add devm_platform_get_irqs_affinity()")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
> I hope that this can go through either irqchip or driver/core trees, thanks!

I'll take it, thanks.

greg k-h

Re: [PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[John Garry]

On 08/01/2021 15:43, Greg KH wrote:
> On Mon, Dec 21, 2020 at 10:30:55PM +0800, John Garry wrote:
>> The current check of nvec < minvec for nvec returned from
>> platform_irq_count() will not detect a negative error code in nvec.
>>
>> This is because minvec is unsigned, and, as such, nvec is promoted to
>> unsigned in that check, which will make it a huge number (if it contained
>> -EPROBE_DEFER).
>>
>> In practice, an error should not occur in nvec for the only in-tree
>> user, but add a check anyway.
>>
>> Fixes: e15f2fa959f2 ("driver core: platform: Add devm_platform_get_irqs_affinity()")
>> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>> Signed-off-by: John Garry <john.garry@huawei.com>
>> ---
>> I hope that this can go through either irqchip or driver/core trees, thanks!
> 
> I'll take it, thanks.
> 

Hi Greg,

I think that Marc already has taken it:

https://lore.kernel.org/lkml/X%2Fh9vy%2F1h0E1hyN0@kroah.com/T/#m95ef1736dbbd801cd85a4144c8f13c2afe33bc2c

I hope it doesn't cause hassle.

Thanks,
John

Re: [PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[Marc Zyngier]

On 2021-01-08 15:43, John Garry wrote:
> On 08/01/2021 15:43, Greg KH wrote:
>> On Mon, Dec 21, 2020 at 10:30:55PM +0800, John Garry wrote:
>>> The current check of nvec < minvec for nvec returned from
>>> platform_irq_count() will not detect a negative error code in nvec.
>>> 
>>> This is because minvec is unsigned, and, as such, nvec is promoted to
>>> unsigned in that check, which will make it a huge number (if it 
>>> contained
>>> -EPROBE_DEFER).
>>> 
>>> In practice, an error should not occur in nvec for the only in-tree
>>> user, but add a check anyway.
>>> 
>>> Fixes: e15f2fa959f2 ("driver core: platform: Add 
>>> devm_platform_get_irqs_affinity()")
>>> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
>>> Signed-off-by: John Garry <john.garry@huawei.com>
>>> ---
>>> I hope that this can go through either irqchip or driver/core trees, 
>>> thanks!
>> 
>> I'll take it, thanks.
>> 
> 
> Hi Greg,
> 
> I think that Marc already has taken it:
> 
> https://lore.kernel.org/lkml/X%2Fh9vy%2F1h0E1hyN0@kroah.com/T/#m95ef1736dbbd801cd85a4144c8f13c2afe33bc2c
> 
> I hope it doesn't cause hassle.

I was about to send tglx a pull request.

Greg, let me know if you want me to drop it.

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...

Re: [PATCH] Driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()

[Greg KH]

On Fri, Jan 08, 2021 at 03:48:24PM +0000, Marc Zyngier wrote:
> On 2021-01-08 15:43, John Garry wrote:
> > On 08/01/2021 15:43, Greg KH wrote:
> > > On Mon, Dec 21, 2020 at 10:30:55PM +0800, John Garry wrote:
> > > > The current check of nvec < minvec for nvec returned from
> > > > platform_irq_count() will not detect a negative error code in nvec.
> > > > 
> > > > This is because minvec is unsigned, and, as such, nvec is promoted to
> > > > unsigned in that check, which will make it a huge number (if it
> > > > contained
> > > > -EPROBE_DEFER).
> > > > 
> > > > In practice, an error should not occur in nvec for the only in-tree
> > > > user, but add a check anyway.
> > > > 
> > > > Fixes: e15f2fa959f2 ("driver core: platform: Add
> > > > devm_platform_get_irqs_affinity()")
> > > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > > Signed-off-by: John Garry <john.garry@huawei.com>
> > > > ---
> > > > I hope that this can go through either irqchip or driver/core
> > > > trees, thanks!
> > > 
> > > I'll take it, thanks.
> > > 
> > 
> > Hi Greg,
> > 
> > I think that Marc already has taken it:
> > 
> > https://lore.kernel.org/lkml/X%2Fh9vy%2F1h0E1hyN0@kroah.com/T/#m95ef1736dbbd801cd85a4144c8f13c2afe33bc2c
> > 
> > I hope it doesn't cause hassle.
> 
> I was about to send tglx a pull request.
> 
> Greg, let me know if you want me to drop it.

Nope, no worries, git will handle this coming in multiple places :)

thanks,

greg k-h