| Message ID | Y1vvCrOMne0XNORj@kili (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | thermal/core: fix error code in __thermal_cooling_device_register() | expand |
On Fri, Oct 28, 2022 at 5:02 PM Dan Carpenter <dan.carpenter@oracle.com> wrote: > > Return an error pointer if ->get_max_state() fails. The current code > returns NULL which will cause an oops in the callers. > > Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/thermal/thermal_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 4ba7b524e5de..c4d18e462de8 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -892,7 +892,8 @@ __thermal_cooling_device_register(struct device_node *np, > cdev->device.class = &thermal_class; > cdev->devdata = devdata; > > - if (cdev->ops->get_max_state(cdev, &cdev->max_state)) > + ret = cdev->ops->get_max_state(cdev, &cdev->max_state); > + if (ret) > goto out_kfree_type; > > thermal_cooling_device_setup_sysfs(cdev); > -- Applied, thanks!
On 28-10-22, 18:02, Dan Carpenter wrote: > Return an error pointer if ->get_max_state() fails. The current code > returns NULL which will cause an oops in the callers. > > Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/thermal/thermal_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 4ba7b524e5de..c4d18e462de8 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -892,7 +892,8 @@ __thermal_cooling_device_register(struct device_node *np, > cdev->device.class = &thermal_class; > cdev->devdata = devdata; > > - if (cdev->ops->get_max_state(cdev, &cdev->max_state)) > + ret = cdev->ops->get_max_state(cdev, &cdev->max_state); > + if (ret) > goto out_kfree_type; > > thermal_cooling_device_setup_sysfs(cdev); Bad mistake. Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 4ba7b524e5de..c4d18e462de8 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -892,7 +892,8 @@ __thermal_cooling_device_register(struct device_node *np, cdev->device.class = &thermal_class; cdev->devdata = devdata; - if (cdev->ops->get_max_state(cdev, &cdev->max_state)) + ret = cdev->ops->get_max_state(cdev, &cdev->max_state); + if (ret) goto out_kfree_type; thermal_cooling_device_setup_sysfs(cdev);
Return an error pointer if ->get_max_state() fails. The current code returns NULL which will cause an oops in the callers. Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/thermal/thermal_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)