summary refs log tree commit diff
path: root/drivers/base
diff options
context:
space:
mode:
authorJohn Garry <john.garry@huawei.com>2020-12-21 22:30:55 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-08 16:44:03 +0100
commit29f7c54b253fc18bff9bf7e9f303b75deb285c7a (patch)
tree1e0fe495068d0512db1b26eec822e2178c0f03e0 /drivers/base
parentd0243bbd5dd3ebbd49dafa8b56bb911d971131d0 (diff)
downloadlinux-29f7c54b253fc18bff9bf7e9f303b75deb285c7a.tar.gz
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>
Link: https://lore.kernel.org/r/1608561055-231244-1-git-send-email-john.garry@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c2
1 files changed, 2 insertions, 0 deletions
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;