[PATCH] thermal: Replace sprintf() with sysfs_emit() for sysfs show functions

Sumeet Pawnikar posted 1 patch 4 weeks, 1 day ago
drivers/thermal/thermal_hwmon.c |  4 ++--
drivers/thermal/thermal_sysfs.c | 36 ++++++++++++++++-----------------
2 files changed, 20 insertions(+), 20 deletions(-)
[PATCH] thermal: Replace sprintf() with sysfs_emit() for sysfs show functions
Posted by Sumeet Pawnikar 4 weeks, 1 day ago
Replace all sprintf() calls with sysfs_emit() and sysfs_emit_at() in
sysfs show functions. sysfs_emit() and sysfs_emit_at() are preferred
over sprintf() for formatting sysfs output as they provide better
bounds checking and prevent potential buffer overflows.

Signed-off-by: Sumeet Pawnikar <sumeet4linux@gmail.com>
---
 drivers/thermal/thermal_hwmon.c |  4 ++--
 drivers/thermal/thermal_sysfs.c | 36 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index 64cc3ab949fe..faf1d0083890 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -63,7 +63,7 @@ temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
 	if (ret)
 		return ret;
 
-	return sprintf(buf, "%d\n", temperature);
+	return sysfs_emit(buf, "%d\n", temperature);
 }
 
 static ssize_t
@@ -84,7 +84,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
 	if (ret)
 		return ret;
 
-	return sprintf(buf, "%d\n", temperature);
+	return sysfs_emit(buf, "%d\n", temperature);
 }
 
 
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index d80612506a33..26b8b340fbe6 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -29,7 +29,7 @@ type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct thermal_zone_device *tz = to_thermal_zone(dev);
 
-	return sprintf(buf, "%s\n", tz->type);
+	return sysfs_emit(buf, "%s\n", tz->type);
 }
 
 static ssize_t
@@ -41,7 +41,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf)
 	ret = thermal_zone_get_temp(tz, &temperature);
 
 	if (!ret)
-		return sprintf(buf, "%d\n", temperature);
+		return sysfs_emit(buf, "%d\n", temperature);
 
 	if (ret == -EAGAIN)
 		return -ENODATA;
@@ -57,9 +57,9 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)
 	guard(thermal_zone)(tz);
 
 	if (tz->mode == THERMAL_DEVICE_ENABLED)
-		return sprintf(buf, "enabled\n");
+		return sysfs_emit(buf, "enabled\n");
 
-	return sprintf(buf, "disabled\n");
+	return sysfs_emit(buf, "disabled\n");
 }
 
 static ssize_t
@@ -97,7 +97,7 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
 {
 	struct thermal_trip *trip = thermal_trip_of_attr(attr, type);
 
-	return sprintf(buf, "%s\n", thermal_trip_type_name(trip->type));
+	return sysfs_emit(buf, "%s\n", thermal_trip_type_name(trip->type));
 }
 
 static ssize_t
@@ -142,7 +142,7 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
 {
 	struct thermal_trip *trip = thermal_trip_of_attr(attr, temp);
 
-	return sprintf(buf, "%d\n", READ_ONCE(trip->temperature));
+	return sysfs_emit(buf, "%d\n", READ_ONCE(trip->temperature));
 }
 
 static ssize_t
@@ -188,7 +188,7 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
 {
 	struct thermal_trip *trip = thermal_trip_of_attr(attr, hyst);
 
-	return sprintf(buf, "%d\n", READ_ONCE(trip->hysteresis));
+	return sysfs_emit(buf, "%d\n", READ_ONCE(trip->hysteresis));
 }
 
 static ssize_t
@@ -213,7 +213,7 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)
 {
 	struct thermal_zone_device *tz = to_thermal_zone(dev);
 
-	return sprintf(buf, "%s\n", tz->governor->name);
+	return sysfs_emit(buf, "%s\n", tz->governor->name);
 }
 
 static ssize_t
@@ -260,7 +260,7 @@ sustainable_power_show(struct device *dev, struct device_attribute *devattr,
 	struct thermal_zone_device *tz = to_thermal_zone(dev);
 
 	if (tz->tzp)
-		return sprintf(buf, "%u\n", tz->tzp->sustainable_power);
+		return sysfs_emit(buf, "%u\n", tz->tzp->sustainable_power);
 	else
 		return -EIO;
 }
@@ -291,7 +291,7 @@ sustainable_power_store(struct device *dev, struct device_attribute *devattr,
 	struct thermal_zone_device *tz = to_thermal_zone(dev);		\
 									\
 	if (tz->tzp)							\
-		return sprintf(buf, "%d\n", tz->tzp->name);		\
+		return sysfs_emit(buf, "%d\n", tz->tzp->name);		\
 	else								\
 		return -EIO;						\
 	}								\
@@ -505,7 +505,7 @@ cdev_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct thermal_cooling_device *cdev = to_cooling_device(dev);
 
-	return sprintf(buf, "%s\n", cdev->type);
+	return sysfs_emit(buf, "%s\n", cdev->type);
 }
 
 static ssize_t max_state_show(struct device *dev, struct device_attribute *attr,
@@ -513,7 +513,7 @@ static ssize_t max_state_show(struct device *dev, struct device_attribute *attr,
 {
 	struct thermal_cooling_device *cdev = to_cooling_device(dev);
 
-	return sprintf(buf, "%ld\n", cdev->max_state);
+	return sysfs_emit(buf, "%ld\n", cdev->max_state);
 }
 
 static ssize_t cur_state_show(struct device *dev, struct device_attribute *attr,
@@ -526,7 +526,7 @@ static ssize_t cur_state_show(struct device *dev, struct device_attribute *attr,
 	ret = cdev->ops->get_cur_state(cdev, &state);
 	if (ret)
 		return ret;
-	return sprintf(buf, "%ld\n", state);
+	return sysfs_emit(buf, "%ld\n", state);
 }
 
 static ssize_t
@@ -638,7 +638,7 @@ static ssize_t total_trans_show(struct device *dev,
 		return 0;
 
 	spin_lock(&stats->lock);
-	ret = sprintf(buf, "%u\n", stats->total_trans);
+	ret = sysfs_emit(buf, "%u\n", stats->total_trans);
 	spin_unlock(&stats->lock);
 
 	return ret;
@@ -664,8 +664,8 @@ time_in_state_ms_show(struct device *dev, struct device_attribute *attr,
 	update_time_in_state(stats);
 
 	for (i = 0; i <= cdev->max_state; i++) {
-		len += sprintf(buf + len, "state%u\t%llu\n", i,
-			       ktime_to_ms(stats->time_in_state[i]));
+		len += sysfs_emit_at(buf, len, "state%u\t%llu\n", i,
+				     ktime_to_ms(stats->time_in_state[i]));
 	}
 	spin_unlock(&stats->lock);
 
@@ -846,7 +846,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf)
 
 	instance = container_of(attr, struct thermal_instance, attr);
 
-	return sprintf(buf, "%d\n", thermal_zone_trip_id(tz, instance->trip));
+	return sysfs_emit(buf, "%d\n", thermal_zone_trip_id(tz, instance->trip));
 }
 
 ssize_t
@@ -856,7 +856,7 @@ weight_show(struct device *dev, struct device_attribute *attr, char *buf)
 
 	instance = container_of(attr, struct thermal_instance, weight_attr);
 
-	return sprintf(buf, "%d\n", instance->weight);
+	return sysfs_emit(buf, "%d\n", instance->weight);
 }
 
 ssize_t weight_store(struct device *dev, struct device_attribute *attr,
-- 
2.43.0
Re: [PATCH] thermal: Replace sprintf() with sysfs_emit() for sysfs show functions
Posted by Rafael J. Wysocki 3 weeks, 2 days ago
On Sat, Jan 10, 2026 at 10:29 AM Sumeet Pawnikar <sumeet4linux@gmail.com> wrote:
>
> Replace all sprintf() calls with sysfs_emit() and sysfs_emit_at() in
> sysfs show functions. sysfs_emit() and sysfs_emit_at() are preferred
> over sprintf() for formatting sysfs output as they provide better
> bounds checking and prevent potential buffer overflows.
>
> Signed-off-by: Sumeet Pawnikar <sumeet4linux@gmail.com>
> ---
>  drivers/thermal/thermal_hwmon.c |  4 ++--
>  drivers/thermal/thermal_sysfs.c | 36 ++++++++++++++++-----------------
>  2 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
> index 64cc3ab949fe..faf1d0083890 100644
> --- a/drivers/thermal/thermal_hwmon.c
> +++ b/drivers/thermal/thermal_hwmon.c
> @@ -63,7 +63,7 @@ temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
>         if (ret)
>                 return ret;
>
> -       return sprintf(buf, "%d\n", temperature);
> +       return sysfs_emit(buf, "%d\n", temperature);
>  }
>
>  static ssize_t
> @@ -84,7 +84,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
>         if (ret)
>                 return ret;
>
> -       return sprintf(buf, "%d\n", temperature);
> +       return sysfs_emit(buf, "%d\n", temperature);
>  }
>
>
> diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
> index d80612506a33..26b8b340fbe6 100644
> --- a/drivers/thermal/thermal_sysfs.c
> +++ b/drivers/thermal/thermal_sysfs.c
> @@ -29,7 +29,7 @@ type_show(struct device *dev, struct device_attribute *attr, char *buf)
>  {
>         struct thermal_zone_device *tz = to_thermal_zone(dev);
>
> -       return sprintf(buf, "%s\n", tz->type);
> +       return sysfs_emit(buf, "%s\n", tz->type);
>  }
>
>  static ssize_t
> @@ -41,7 +41,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf)
>         ret = thermal_zone_get_temp(tz, &temperature);
>
>         if (!ret)
> -               return sprintf(buf, "%d\n", temperature);
> +               return sysfs_emit(buf, "%d\n", temperature);
>
>         if (ret == -EAGAIN)
>                 return -ENODATA;
> @@ -57,9 +57,9 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)
>         guard(thermal_zone)(tz);
>
>         if (tz->mode == THERMAL_DEVICE_ENABLED)
> -               return sprintf(buf, "enabled\n");
> +               return sysfs_emit(buf, "enabled\n");
>
> -       return sprintf(buf, "disabled\n");
> +       return sysfs_emit(buf, "disabled\n");
>  }
>
>  static ssize_t
> @@ -97,7 +97,7 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
>  {
>         struct thermal_trip *trip = thermal_trip_of_attr(attr, type);
>
> -       return sprintf(buf, "%s\n", thermal_trip_type_name(trip->type));
> +       return sysfs_emit(buf, "%s\n", thermal_trip_type_name(trip->type));
>  }
>
>  static ssize_t
> @@ -142,7 +142,7 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
>  {
>         struct thermal_trip *trip = thermal_trip_of_attr(attr, temp);
>
> -       return sprintf(buf, "%d\n", READ_ONCE(trip->temperature));
> +       return sysfs_emit(buf, "%d\n", READ_ONCE(trip->temperature));
>  }
>
>  static ssize_t
> @@ -188,7 +188,7 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
>  {
>         struct thermal_trip *trip = thermal_trip_of_attr(attr, hyst);
>
> -       return sprintf(buf, "%d\n", READ_ONCE(trip->hysteresis));
> +       return sysfs_emit(buf, "%d\n", READ_ONCE(trip->hysteresis));
>  }
>
>  static ssize_t
> @@ -213,7 +213,7 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf)
>  {
>         struct thermal_zone_device *tz = to_thermal_zone(dev);
>
> -       return sprintf(buf, "%s\n", tz->governor->name);
> +       return sysfs_emit(buf, "%s\n", tz->governor->name);
>  }
>
>  static ssize_t
> @@ -260,7 +260,7 @@ sustainable_power_show(struct device *dev, struct device_attribute *devattr,
>         struct thermal_zone_device *tz = to_thermal_zone(dev);
>
>         if (tz->tzp)
> -               return sprintf(buf, "%u\n", tz->tzp->sustainable_power);
> +               return sysfs_emit(buf, "%u\n", tz->tzp->sustainable_power);
>         else
>                 return -EIO;
>  }
> @@ -291,7 +291,7 @@ sustainable_power_store(struct device *dev, struct device_attribute *devattr,
>         struct thermal_zone_device *tz = to_thermal_zone(dev);          \
>                                                                         \
>         if (tz->tzp)                                                    \
> -               return sprintf(buf, "%d\n", tz->tzp->name);             \
> +               return sysfs_emit(buf, "%d\n", tz->tzp->name);          \
>         else                                                            \
>                 return -EIO;                                            \
>         }                                                               \
> @@ -505,7 +505,7 @@ cdev_type_show(struct device *dev, struct device_attribute *attr, char *buf)
>  {
>         struct thermal_cooling_device *cdev = to_cooling_device(dev);
>
> -       return sprintf(buf, "%s\n", cdev->type);
> +       return sysfs_emit(buf, "%s\n", cdev->type);
>  }
>
>  static ssize_t max_state_show(struct device *dev, struct device_attribute *attr,
> @@ -513,7 +513,7 @@ static ssize_t max_state_show(struct device *dev, struct device_attribute *attr,
>  {
>         struct thermal_cooling_device *cdev = to_cooling_device(dev);
>
> -       return sprintf(buf, "%ld\n", cdev->max_state);
> +       return sysfs_emit(buf, "%ld\n", cdev->max_state);
>  }
>
>  static ssize_t cur_state_show(struct device *dev, struct device_attribute *attr,
> @@ -526,7 +526,7 @@ static ssize_t cur_state_show(struct device *dev, struct device_attribute *attr,
>         ret = cdev->ops->get_cur_state(cdev, &state);
>         if (ret)
>                 return ret;
> -       return sprintf(buf, "%ld\n", state);
> +       return sysfs_emit(buf, "%ld\n", state);
>  }
>
>  static ssize_t
> @@ -638,7 +638,7 @@ static ssize_t total_trans_show(struct device *dev,
>                 return 0;
>
>         spin_lock(&stats->lock);
> -       ret = sprintf(buf, "%u\n", stats->total_trans);
> +       ret = sysfs_emit(buf, "%u\n", stats->total_trans);
>         spin_unlock(&stats->lock);
>
>         return ret;
> @@ -664,8 +664,8 @@ time_in_state_ms_show(struct device *dev, struct device_attribute *attr,
>         update_time_in_state(stats);
>
>         for (i = 0; i <= cdev->max_state; i++) {
> -               len += sprintf(buf + len, "state%u\t%llu\n", i,
> -                              ktime_to_ms(stats->time_in_state[i]));
> +               len += sysfs_emit_at(buf, len, "state%u\t%llu\n", i,
> +                                    ktime_to_ms(stats->time_in_state[i]));
>         }
>         spin_unlock(&stats->lock);
>
> @@ -846,7 +846,7 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf)
>
>         instance = container_of(attr, struct thermal_instance, attr);
>
> -       return sprintf(buf, "%d\n", thermal_zone_trip_id(tz, instance->trip));
> +       return sysfs_emit(buf, "%d\n", thermal_zone_trip_id(tz, instance->trip));
>  }
>
>  ssize_t
> @@ -856,7 +856,7 @@ weight_show(struct device *dev, struct device_attribute *attr, char *buf)
>
>         instance = container_of(attr, struct thermal_instance, weight_attr);
>
> -       return sprintf(buf, "%d\n", instance->weight);
> +       return sysfs_emit(buf, "%d\n", instance->weight);
>  }
>
>  ssize_t weight_store(struct device *dev, struct device_attribute *attr,
> --

Applied as 6.20 material, thanks!