2021-04-07 02:58:43

by Yang Yingliang

[permalink] [raw]

Subject: [PATCH -next] leds: tlc591xx: fix return value check in tlc591xx_probe()

---

After device_get_match_data(), tlc591xx is not checked, add
check for it and also check np after dev_of_node.

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/leds/leds-tlc591xx.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index 5b9dfdf743ec..cb7bd1353f9f 100644
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -148,16 +148,20 @@ static int
tlc591xx_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct device_node *np = dev_of_node(&client->dev), *child;
+ struct device_node *np, *child;
struct device *dev = &client->dev;
const struct tlc591xx *tlc591xx;
struct tlc591xx_priv *priv;
int err, count, reg;

- tlc591xx = device_get_match_data(dev);
+ np = dev_of_node(dev);
if (!np)
return -ENODEV;

+ tlc591xx = device_get_match_data(dev);
+ if (!tlc591xx)
+ return -ENODEV;
+
count = of_get_available_child_count(np);
if (!count || count > tlc591xx->max_leds)
return -EINVAL;
--
2.25.1

2021-05-10 10:00:11

by Pavel Machek

[permalink] [raw]

Subject: Re: [PATCH -next] leds: tlc591xx: fix return value check in tlc591xx_probe()

---

On Tue 2021-04-06 21:11:59, Yang Yingliang wrote:
> After device_get_match_data(), tlc591xx is not checked, add
> check for it and also check np after dev_of_node.
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>

Thanks, applied.
Pavel

--
http://www.livejournal.com/~pavelmachek

---

Attachments:

(No filename) (369.00 B)
signature.asc (188.00 B)
Digital signature Download all attachments