提交 791700cd 编写于 作者: H Hugh Dickins 提交者: Zhang Rui

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: NDan Carpenter <dan.carpenter@oracle.com>
Reported-by: NSedat Dilek <sedat.dilek@gmail.com>
Reported-by: NHugh Dickins <hughd@google.com>
Signed-off-by: NDurgadoss R <durgadoss.r@intel.com>
Signed-off-by: NSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: NHugh Dickins <hughd@google.com>
Signed-off-by: NZhang Rui <rui.zhang@intel.com>
上级 a56757af
......@@ -252,8 +252,8 @@ static void bind_cdev(struct thermal_cooling_device *cdev)
}
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_device *tz)
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 thermal_zone_device *tz)
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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册