Skip to content

Commit

Permalink
Driver core: platform: Add extra error check in devm_platform_get_irq…
Browse files Browse the repository at this point in the history
…s_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: e15f2fa ("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>
  • Loading branch information
John Garry authored and Greg Kroah-Hartman committed Jan 8, 2021
1 parent d0243bb commit 29f7c54
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 29f7c54

Please sign in to comment.