Commit 34b95aa1 authored by Simon Schwartz's avatar Simon Schwartz Committed by Greg Kroah-Hartman

driver core: platform: Prevent resouce overflow from causing infinite loops

[ Upstream commit 39cc539f ]

num_resources in the platform_device struct is declared as a u32.  The
for loops that iterate over num_resources use an int as the counter,
which can cause infinite loops on architectures with smaller ints.
Change the loop counters to u32.
Signed-off-by: default avatarSimon Schwartz <kern.simon@theschwartz.xyz>
Link: https://lore.kernel.org/r/2201ce63a2a171ffd2ed14e867875316efcf71db.camel@theschwartz.xyzSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ad4a9f68
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/kmemleak.h> #include <linux/kmemleak.h>
#include <linux/types.h>
#include "base.h" #include "base.h"
#include "power/power.h" #include "power/power.h"
...@@ -68,7 +69,7 @@ void __weak arch_setup_pdev_archdata(struct platform_device *pdev) ...@@ -68,7 +69,7 @@ void __weak arch_setup_pdev_archdata(struct platform_device *pdev)
struct resource *platform_get_resource(struct platform_device *dev, struct resource *platform_get_resource(struct platform_device *dev,
unsigned int type, unsigned int num) unsigned int type, unsigned int num)
{ {
int i; u32 i;
for (i = 0; i < dev->num_resources; i++) { for (i = 0; i < dev->num_resources; i++) {
struct resource *r = &dev->resource[i]; struct resource *r = &dev->resource[i];
...@@ -153,7 +154,7 @@ struct resource *platform_get_resource_byname(struct platform_device *dev, ...@@ -153,7 +154,7 @@ struct resource *platform_get_resource_byname(struct platform_device *dev,
unsigned int type, unsigned int type,
const char *name) const char *name)
{ {
int i; u32 i;
for (i = 0; i < dev->num_resources; i++) { for (i = 0; i < dev->num_resources; i++) {
struct resource *r = &dev->resource[i]; struct resource *r = &dev->resource[i];
...@@ -350,7 +351,8 @@ EXPORT_SYMBOL_GPL(platform_device_add_properties); ...@@ -350,7 +351,8 @@ EXPORT_SYMBOL_GPL(platform_device_add_properties);
*/ */
int platform_device_add(struct platform_device *pdev) int platform_device_add(struct platform_device *pdev)
{ {
int i, ret; u32 i;
int ret;
if (!pdev) if (!pdev)
return -EINVAL; return -EINVAL;
...@@ -437,7 +439,7 @@ EXPORT_SYMBOL_GPL(platform_device_add); ...@@ -437,7 +439,7 @@ EXPORT_SYMBOL_GPL(platform_device_add);
*/ */
void platform_device_del(struct platform_device *pdev) void platform_device_del(struct platform_device *pdev)
{ {
int i; u32 i;
if (pdev) { if (pdev) {
device_remove_properties(&pdev->dev); device_remove_properties(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment