Re: [PATCHv2] Thermal: Fix synchronization issues in thermal_sys.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Sep 28, 2012 at 1:48 AM, Hugh Dickins <hughd@xxxxxxxxxx> wrote:
> On Thu, 27 Sep 2012, Sedat Dilek wrote:
>> >>
>> >> The v2 patch does *not* fix the issue here!
>> >>
>> >> [1] https://patchwork.kernel.org/patch/1511961/
>> >>
>> >
>> > I have re-tested with Linux-Next (next-20120927) plus thermal-next [1]
>> > pulled in and see still the same call-trace!
>
> Same here on mmotm, yes.
>
>> >
>> > Hugh or Dan can you confirm this works for you or not?
>> > Thanks in advance.
>> >
>> > [1] http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=shortlog;h=refs/heads/next
>> > [2] http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=commitdiff;h=404b134156bd9d9bc506c0974a1254806e13db2c
>> >
>>
>> With the attached fixup/followup patch, I can boot into my system!
>> But, as said yesterday... working within X, Firefox is a pain in the a**.
>
> Indeed, this works for me too, thanks.
> Let's get your addition out of the attachment and fold it into a v3.
> Mind if we change "synchronization issues" to "oops and unlocking"?
>
>

Cool, I see this new patch now in [1].
Thanks to all involved people!

- Sedat -

[1] http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=commitdiff;h=6b02e5bd25fea17b3271d275d5700e22d7195a68

> [PATCHv3] Thermal: Fix oops and unlocking in thermal_sys.c
>
> This patch fixes the following mutex and NULL pointer
> problems in thermal_sys.c:
>
>  * mutex_unlock fix in update_temperature function
>  * mutex_unlock fix in bind_cdev function
>  * Correct early return to continue in bind_cdev function
>  * NULL check fix in bind_cdev function
>  * NULL check fix in bind_tz function
>
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Reported-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
> Reported-by: Hugh Dickins <hughd@xxxxxxxxxx>
> Signed-off-by: Durgadoss R <durgadoss.r@xxxxxxxxx>
> Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
> Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
> ---
> v3:
>  * Sedat restored necessary NULL check in bind_cdev and his signoff.
>  * Hugh added two more comments above, his signoff, and Dan's 'Reported-by'.
>
>  drivers/thermal/thermal_sys.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> --- mmotm/drivers/thermal/thermal_sys.c 2012-09-26 10:15:28.652071362 -0700
> +++ linux/drivers/thermal/thermal_sys.c 2012-09-27 16:19:14.427515890 -0700
> @@ -252,8 +252,8 @@ static void bind_cdev(struct thermal_coo
>                 }
>
>                 tzp = pos->tzp;
> -               if (!tzp->tbp)
> -                       return;
> +               if (!tzp || !tzp->tbp)
> +                       continue;
>
>                 for (i = 0; i < tzp->num_tbps; i++) {
>                         if (tzp->tbp[i].cdev || !tzp->tbp[i].match)
> @@ -289,7 +289,7 @@ static void bind_tz(struct thermal_zone_
>                 goto exit;
>         }
>
> -       if (!tzp->tbp)
> +       if (!tzp || !tzp->tbp)
>                 goto exit;
>
>         list_for_each_entry(pos, &thermal_cdev_list, node) {
> @@ -387,12 +387,13 @@ static void update_temperature(struct th
>         ret = tz->ops->get_temp(tz, &temp);
>         if (ret) {
>                 pr_warn("failed to read out thermal zone %d\n", tz->id);
> -               return;
> +               goto exit;
>         }
>
>         tz->last_temperature = tz->temperature;
>         tz->temperature = temp;
>
> +exit:
>         mutex_unlock(&tz->lock);
>  }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux