2020-05-23 03:19:58

by Qiushi Wu

Subject: [PATCH] platform/chrome: fix a double-unlock issue

From: Qiushi Wu <[email protected]>

In function cros_ec_ishtp_probe(), "up_write" is already called
before function "cros_ec_dev_init". But "up_write" will be called
again after the calling of the function "cros_ec_dev_init" failed.
Thus add a call of the function “down_write” in this if branch
for the completion of the exception handling.

Fixes: 26a14267aff2 ("platform/chrome: Add ChromeOS EC ISHTP driver")
Signed-off-by: Qiushi Wu <[email protected]>
---
drivers/platform/chrome/cros_ec_ishtp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index 93a71e93a2f1..41d60af618c9 100644
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -660,8 +660,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)

/* Register croc_ec_dev mfd */
rv = cros_ec_dev_init(client_data);
- if (rv)
+ if (rv) {
+ down_write(&init_lock);
goto end_cros_ec_dev_init_error;
+ }

return 0;

--
2.17.1

2020-06-25 09:41:23

by Enric Balletbo i Serra

Subject: Re: [PATCH] platform/chrome: fix a double-unlock issue

Hi Qiushi,

Thank you for your patch.

On 23/5/20 5:16, [email protected] wrote:
> From: Qiushi Wu <[email protected]>
>
> In function cros_ec_ishtp_probe(), "up_write" is already called
> before function "cros_ec_dev_init". But "up_write" will be called
> again after the calling of the function "cros_ec_dev_init" failed.
> Thus add a call of the function “down_write” in this if branch
> for the completion of the exception handling.
>
> Fixes: 26a14267aff2 ("platform/chrome: Add ChromeOS EC ISHTP driver")
> Signed-off-by: Qiushi Wu <[email protected]>

The change looks good to me, but I'd like someone having the hardware giving a
Tested-by tag, so cc'ing some chromeos people. They must be also interested on
backport this patch.

> ---
> drivers/platform/chrome/cros_ec_ishtp.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
> index 93a71e93a2f1..41d60af618c9 100644
> --- a/drivers/platform/chrome/cros_ec_ishtp.c
> +++ b/drivers/platform/chrome/cros_ec_ishtp.c
> @@ -660,8 +660,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
>
> /* Register croc_ec_dev mfd */
> rv = cros_ec_dev_init(client_data);
> - if (rv)
> + if (rv) {
> + down_write(&init_lock);
> goto end_cros_ec_dev_init_error;
> + }
>
> return 0;
>
>

2020-06-26 17:15:05

by Mat King

Subject: Re: [PATCH] platform/chrome: fix a double-unlock issue

On Thu, Jun 25, 2020 at 2:26 AM Enric Balletbo i Serra
<[email protected]> wrote:
>
> Hi Qiushi,
>
> Thank you for your patch.
>
> On 23/5/20 5:16, [email protected] wrote:
> > From: Qiushi Wu <[email protected]>
> >
> > In function cros_ec_ishtp_probe(), "up_write" is already called
> > before function "cros_ec_dev_init". But "up_write" will be called
> > again after the calling of the function "cros_ec_dev_init" failed.
> > Thus add a call of the function “down_write” in this if branch
> > for the completion of the exception handling.
> >
> > Fixes: 26a14267aff2 ("platform/chrome: Add ChromeOS EC ISHTP driver")
> > Signed-off-by: Qiushi Wu <[email protected]>
Tested-by: Mathew King <[email protected]>
Signed-off-by: Mathew King <[email protected]>

>
> The change looks good to me, but I'd like someone having the hardware giving a
> Tested-by tag, so cc'ing some chromeos people. They must be also interested on
> backport this patch.

Tested on a device with ish based cros EC. Looks good to me.
>
> > ---
> > drivers/platform/chrome/cros_ec_ishtp.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
> > index 93a71e93a2f1..41d60af618c9 100644
> > --- a/drivers/platform/chrome/cros_ec_ishtp.c
> > +++ b/drivers/platform/chrome/cros_ec_ishtp.c
> > @@ -660,8 +660,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
> >
> > /* Register croc_ec_dev mfd */
> > rv = cros_ec_dev_init(client_data);
> > - if (rv)
> > + if (rv) {
> > + down_write(&init_lock);
> > goto end_cros_ec_dev_init_error;
> > + }
> >
> > return 0;
> >
> >

2020-07-01 09:12:12

by Enric Balletbo i Serra

Subject: Re: [PATCH] platform/chrome: fix a double-unlock issue

Hi Qiushi,

Thank you for the patch.

On 23/5/20 5:16, [email protected] wrote:
> From: Qiushi Wu <[email protected]>
>
> In function cros_ec_ishtp_probe(), "up_write" is already called
> before function "cros_ec_dev_init". But "up_write" will be called
> again after the calling of the function "cros_ec_dev_init" failed.
> Thus add a call of the function “down_write” in this if branch
> for the completion of the exception handling.
>
> Fixes: 26a14267aff2 ("platform/chrome: Add ChromeOS EC ISHTP driver")
> Signed-off-by: Qiushi Wu <[email protected]>

Applied for 5.9

> ---
> drivers/platform/chrome/cros_ec_ishtp.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
> index 93a71e93a2f1..41d60af618c9 100644
> --- a/drivers/platform/chrome/cros_ec_ishtp.c
> +++ b/drivers/platform/chrome/cros_ec_ishtp.c
> @@ -660,8 +660,10 @@ static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
>
> /* Register croc_ec_dev mfd */
> rv = cros_ec_dev_init(client_data);
> - if (rv)
> + if (rv) {
> + down_write(&init_lock);
> goto end_cros_ec_dev_init_error;
> + }
>
> return 0;
>
>