| Message ID | 20200423125757.14057-1-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | thermal: ti-soc-thermal: avoid dereferencing ERR_PTR | expand |
On Thu, Apr 23, 2020 at 6:27 PM Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > On error the function ti_bandgap_get_sensor_data() returns the error > code in ERR_PTR() but we only checked if the return value is NULL or > not. And, so we can dereference a error code inside ERR_PTR. Typo, s/a error/an error/ I see other uses of ti_bandgap_set_sensor_data() in the same file that could use similar checks. e.g. ti_thermal_unregister_cpu_cooling, possibly ti_thermal_report_sensor_temperature? > > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > --- > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > index d3e959d01606..1e2bf1f22dd1 100644 > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > @@ -196,7 +196,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) > > data = ti_bandgap_get_sensor_data(bgp, id); > > - if (data && data->ti_thermal) { > + if (!IS_ERR_OR_NULL(data) && data->ti_thermal) { > if (data->our_zone) > thermal_zone_device_unregister(data->ti_thermal); > } > -- > 2.11.0 >
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index d3e959d01606..1e2bf1f22dd1 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -196,7 +196,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) data = ti_bandgap_get_sensor_data(bgp, id); - if (data && data->ti_thermal) { + if (!IS_ERR_OR_NULL(data) && data->ti_thermal) { if (data->our_zone) thermal_zone_device_unregister(data->ti_thermal); }
On error the function ti_bandgap_get_sensor_data() returns the error code in ERR_PTR() but we only checked if the return value is NULL or not. And, so we can dereference a error code inside ERR_PTR. Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> --- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)