Skip to content

Commit

Permalink
thermal: testing: Initialize some variables annoteded with _free()
Browse files Browse the repository at this point in the history
Variables annotated with __free() need to be initialized if the function
can return before they get updated for the first time or the attempt to
free the memory pointed to by them upon function return may crash the
kernel.

Fix this issue in some places in the thermal testing code.

Fixes: f6a034f ("thermal: Introduce a debugfs-based testing facility")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/12576267.O9o76ZdvQC@rjwysocki.net
  • Loading branch information
Rafael J. Wysocki committed Nov 14, 2024
1 parent 1c426fd commit 0104dcd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/thermal/testing/zone.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static void tt_add_tz_work_fn(struct work_struct *work)
int tt_add_tz(void)
{
struct tt_thermal_zone *tt_zone __free(kfree);
struct tt_work *tt_work __free(kfree);
struct tt_work *tt_work __free(kfree) = NULL;
int ret;

tt_zone = kzalloc(sizeof(*tt_zone), GFP_KERNEL);
Expand Down Expand Up @@ -237,7 +237,7 @@ static void tt_zone_unregister_tz(struct tt_thermal_zone *tt_zone)

int tt_del_tz(const char *arg)
{
struct tt_work *tt_work __free(kfree);
struct tt_work *tt_work __free(kfree) = NULL;
struct tt_thermal_zone *tt_zone, *aux;
int ret;
int id;
Expand Down Expand Up @@ -331,8 +331,8 @@ static void tt_zone_add_trip_work_fn(struct work_struct *work)
int tt_zone_add_trip(const char *arg)
{
struct tt_thermal_zone *tt_zone __free(put_tt_zone) = NULL;
struct tt_trip *tt_trip __free(kfree) = NULL;
struct tt_work *tt_work __free(kfree);
struct tt_trip *tt_trip __free(kfree);
int id;

tt_work = kzalloc(sizeof(*tt_work), GFP_KERNEL);
Expand Down Expand Up @@ -387,7 +387,7 @@ static struct thermal_zone_device_ops tt_zone_ops = {

static int tt_zone_register_tz(struct tt_thermal_zone *tt_zone)
{
struct thermal_trip *trips __free(kfree);
struct thermal_trip *trips __free(kfree) = NULL;
struct thermal_zone_device *tz;
struct tt_trip *tt_trip;
int i;
Expand Down

0 comments on commit 0104dcd

Please sign in to comment.