2018-12-21 06:54:08

by Kangjie Lu

[permalink] [raw]

Subject: [PATCH] power: twl4030: fix a missing check of return value

---

If twl4030_bci_read() fails, the read data in "s" is incorrect,
which is however used in the following execution. The fix checks
the return value of twl4030_bci_read() and returns an error code
upstream upon the failure of twl4030_bci_read().

Signed-off-by: Kangjie Lu <[email protected]>
---
drivers/power/supply/twl4030_charger.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 0e202d4273fb..4299873a1118 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -809,7 +809,9 @@ static int twl4030_bci_get_property(struct power_supply *psy,
is_charging = state & TWL4030_MSTATEC_AC;
if (!is_charging) {
u8 s;
- twl4030_bci_read(TWL4030_BCIMDEN, &s);
+ ret = twl4030_bci_read(TWL4030_BCIMDEN, &s);
+ if (ret < 0)
+ return ret;
if (psy->desc->type == POWER_SUPPLY_TYPE_USB)
is_charging = s & 1;
else
--
2.17.1

2019-01-21 07:16:50

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH] power: twl4030: fix a missing check of return value

---

Hi,

On Thu, Dec 20, 2018 at 01:51:24PM -0600, Kangjie Lu wrote:
> If twl4030_bci_read() fails, the read data in "s" is incorrect,
> which is however used in the following execution. The fix checks
> the return value of twl4030_bci_read() and returns an error code
> upstream upon the failure of twl4030_bci_read().
>
> Signed-off-by: Kangjie Lu <[email protected]>
> ---

Thanks, queued to power-supply-next.

-- Sebastian

> drivers/power/supply/twl4030_charger.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 0e202d4273fb..4299873a1118 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -809,7 +809,9 @@ static int twl4030_bci_get_property(struct power_supply *psy,
> is_charging = state & TWL4030_MSTATEC_AC;
> if (!is_charging) {
> u8 s;
> - twl4030_bci_read(TWL4030_BCIMDEN, &s);
> + ret = twl4030_bci_read(TWL4030_BCIMDEN, &s);
> + if (ret < 0)
> + return ret;
> if (psy->desc->type == POWER_SUPPLY_TYPE_USB)
> is_charging = s & 1;
> else
> --
> 2.17.1
>

---

Attachments:

(No filename) (1.17 kB)
signature.asc (849.00 B)
Download all attachments