Skip to contentSkip to conversation

perf/x86/intel/uncore: Use sysfs_emit() in uncore_event_show()

PATCH Superseded Thorsten Blum 2 participants 2 messages Apr 21 – Apr 22

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 perf/x86/intel/uncore: Use sysfs_emit() in uncore_event_show()

Replace sprintf() with sysfs_emit() in uncore_event_show(). sysfs_emit() is preferred for formatting sysfs output because it provides safer bounds checking.

Add a terminating newline as suggested by checkpatch.

---
Changes in v2:
- Add a terminating newline as suggested by checkpatch
- Link to v1: https://lore.kernel.org/lkml/[email protected]/

---
 arch/x86/events/intel/uncore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +2 -1
index 4684649109d9..86bc1c03b64a 100644
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
+#include <linux/sysfs.h>
 
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
@@ -133,7 +134,7 @@ ssize_t uncore_event_show(struct device *dev,
 {
 	struct uncore_event_desc *event =
 		container_of(attr, struct uncore_event_desc, attr);
-	return sprintf(buf, "%s", event->config);
+	return sysfs_emit(buf, "%s\n", event->config);
 }
 
 struct intel_uncore_box *uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu)
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Thorsten Blum

Replace sprintf() with sysfs_emit() in uncore_event_show(). sysfs_emit() is preferred for formatting sysfs output because it provides safer bounds checking.

Add a terminating newline as suggested by checkpatch.

I'm ok with adding it but it may cause a compatibility problem.. But I think perf tools can handle it as other PMUs already emit a newline at the end.

Thanks,
Namhyung

Quoted 30 lines

---
Changes in v2:
- Add a terminating newline as suggested by checkpatch
- Link to v1: https://lore.kernel.org/lkml/[email protected]/

---
 arch/x86/events/intel/uncore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +2 -1
index 4684649109d9..86bc1c03b64a 100644
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
+#include <linux/sysfs.h>
 
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
@@ -133,7 +134,7 @@ ssize_t uncore_event_show(struct device *dev,
 {
 	struct uncore_event_desc *event =
 		container_of(attr, struct uncore_event_desc, attr);
-	return sprintf(buf, "%s", event->config);
+	return sysfs_emit(buf, "%s\n", event->config);
 }
 
 struct intel_uncore_box *uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu)