2021-04-21 20:01:56

by zhuguangqing83

[permalink] [raw]
Subject: [PATCH v2] power: supply: cpcap-battery: fix invalid usage of list cursor

From: Guangqing Zhu <[email protected]>

Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
Empty list or fully traversed list points to list head, which is not
NULL (and before the first element containing real data).

Signed-off-by: Guangqing Zhu <[email protected]>
---
v2:
- Modify commit message and code as suggested by Sebastian.
---
drivers/power/supply/cpcap-battery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 6d5bcdb9f45d..a3fc0084cda0 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
break;
}

- if (!d)
+ if (list_entry_is_head(d, &ddata->irq_list, node))
return IRQ_NONE;

latest = cpcap_battery_latest(ddata);
--
2.17.1


2021-04-22 01:08:41

by Carl Philipp Klemm

[permalink] [raw]
Subject: Re: [PATCH v2] power: supply: cpcap-battery: fix invalid usage of list cursor

Looks good to me, but dosent appear to solve the bootup bug.

(this time reply all)

Reviewed-by: Carl Philipp Klemm <[email protected]>
Tested-by: Carl Philipp Klemm <[email protected]>

--
Carl Philipp Klemm <[email protected]> <[email protected]>

On Wed, 21 Apr 2021 19:04:30 +0300
Tony Lindgren <[email protected]> wrote:

> Hi,
>
> * [email protected] <[email protected]> [210421 14:38]:
> > From: Guangqing Zhu <[email protected]>
> >
> > Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
> > Empty list or fully traversed list points to list head, which is not
> > NULL (and before the first element containing real data).
> >
> > Signed-off-by: Guangqing Zhu <[email protected]>
> > ---
> > v2:
> > - Modify commit message and code as suggested by Sebastian.
>
> Thanks looks OK to me. Looks like there's no flag we need to set there when
> the entry is found, so this should do for the check.
>
> Hmm I wonder if this just might fix the issue where booting with a USB
> charger connected can hang..
>
> Reviewed-by: Tony Lindgren <[email protected]>
>
> > ---
> > drivers/power/supply/cpcap-battery.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> > index 6d5bcdb9f45d..a3fc0084cda0 100644
> > --- a/drivers/power/supply/cpcap-battery.c
> > +++ b/drivers/power/supply/cpcap-battery.c
> > @@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
> > break;
> > }
> >
> > - if (!d)
> > + if (list_entry_is_head(d, &ddata->irq_list, node))
> > return IRQ_NONE;
> >
> > latest = cpcap_battery_latest(ddata);
> > --
> > 2.17.1
> >

2021-04-22 01:26:24

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH v2] power: supply: cpcap-battery: fix invalid usage of list cursor

Hi,

On Wed, Apr 21, 2021 at 07:19:33PM +0200, Carl Philipp Klemm wrote:
> Tony Lindgren <[email protected]> wrote:
> > * [email protected] <[email protected]> [210421 14:38]:
> > > From: Guangqing Zhu <[email protected]>
> > >
> > > Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
> > > Empty list or fully traversed list points to list head, which is not
> > > NULL (and before the first element containing real data).
> > >
> > > Signed-off-by: Guangqing Zhu <[email protected]>
> > > ---
> > > v2:
> > > - Modify commit message and code as suggested by Sebastian.
> >
> > Thanks looks OK to me. Looks like there's no flag we need to set there when
> > the entry is found, so this should do for the check.
> >
> > Hmm I wonder if this just might fix the issue where booting with a USB
> > charger connected can hang..
> >
> > Reviewed-by: Tony Lindgren <[email protected]>
>
> Looks good to me, but dosent appear to solve the bootup bug.
>
> (this time reply all)
>
> Reviewed-by: Carl Philipp Klemm <[email protected]>
> Tested-by: Carl Philipp Klemm <[email protected]>

Thanks, queued.

-- Sebastian

> > > drivers/power/supply/cpcap-battery.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> > > index 6d5bcdb9f45d..a3fc0084cda0 100644
> > > --- a/drivers/power/supply/cpcap-battery.c
> > > +++ b/drivers/power/supply/cpcap-battery.c
> > > @@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
> > > break;
> > > }
> > >
> > > - if (!d)
> > > + if (list_entry_is_head(d, &ddata->irq_list, node))
> > > return IRQ_NONE;
> > >
> > > latest = cpcap_battery_latest(ddata);
> > > --
> > > 2.17.1
> > >


Attachments:
(No filename) (1.84 kB)
signature.asc (849.00 B)
Download all attachments

2021-04-22 01:42:17

by Tony Lindgren

[permalink] [raw]
Subject: Re: [PATCH v2] power: supply: cpcap-battery: fix invalid usage of list cursor

Hi,

* [email protected] <[email protected]> [210421 14:38]:
> From: Guangqing Zhu <[email protected]>
>
> Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
> Empty list or fully traversed list points to list head, which is not
> NULL (and before the first element containing real data).
>
> Signed-off-by: Guangqing Zhu <[email protected]>
> ---
> v2:
> - Modify commit message and code as suggested by Sebastian.

Thanks looks OK to me. Looks like there's no flag we need to set there when
the entry is found, so this should do for the check.

Hmm I wonder if this just might fix the issue where booting with a USB
charger connected can hang..

Reviewed-by: Tony Lindgren <[email protected]>

> ---
> drivers/power/supply/cpcap-battery.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> index 6d5bcdb9f45d..a3fc0084cda0 100644
> --- a/drivers/power/supply/cpcap-battery.c
> +++ b/drivers/power/supply/cpcap-battery.c
> @@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
> break;
> }
>
> - if (!d)
> + if (list_entry_is_head(d, &ddata->irq_list, node))
> return IRQ_NONE;
>
> latest = cpcap_battery_latest(ddata);
> --
> 2.17.1
>