Skip to contentSkip to conversation

mm-shmem-convert-shmem_enabled_show-to-use-sysfs_emit_at.patch removed from -mm tree

merged [email protected] 1 participant 1 message Dec 16, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm: shmem: convert shmem_enabled_show to use sysfs_emit_at
has been removed from the -mm tree. Its filename was
mm-shmem-convert-shmem_enabled_show-to-use-sysfs_emit_at.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Joe Perches <[email protected]>
Subject: mm: shmem: convert shmem_enabled_show to use sysfs_emit_at

Update the function to use sysfs_emit_at while neatening the uses of sprintf and overwriting the last space char with a newline to avoid possible output buffer overflow.

Miscellanea:

o in shmem_enabled_show, the removal of the indirected use of fmt allows __printf verification

---

 mm/shmem.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
mm/shmem.c renamed from mm/shmem.c~mm-shmem-convert-shmem_enabled_show-to-use-sysfs_emit_at +12 -9
@@ -4020,7 +4020,7 @@ out2:
 
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_SYSFS)
 static ssize_t shmem_enabled_show(struct kobject *kobj,
-		struct kobj_attribute *attr, char *buf)
+				  struct kobj_attribute *attr, char *buf)
 {
 	static const int values[] = {
 		SHMEM_HUGE_ALWAYS,
@@ -4030,16 +4030,19 @@ static ssize_t shmem_enabled_show(struct
 		SHMEM_HUGE_DENY,
 		SHMEM_HUGE_FORCE,
 	};
-	int i, count;
+	int len = 0;
+	int i;
 
-	for (i = 0, count = 0; i < ARRAY_SIZE(values); i++) {
-		const char *fmt = shmem_huge == values[i] ? "[%s] " : "%s ";
-
-		count += sprintf(buf + count, fmt,
-				shmem_format_huge(values[i]));
+	for (i = 0; i < ARRAY_SIZE(values); i++) {
+		len += sysfs_emit_at(buf, len,
+				     shmem_huge == values[i] ? "%s[%s]" : "%s%s",
+				     i ? " " : "",
+				     shmem_format_huge(values[i]));
 	}
-	buf[count - 1] = '\n';
-	return count;
+
+	len += sysfs_emit_at(buf, len, "\n");
+
+	return len;
 }
 
 static ssize_t shmem_enabled_store(struct kobject *kobj,

_

Patches currently in -mm which might be from [email protected] are

checkpatch-prefer-static-const-declarations.patch checkpatch-allow-fix-removal-of-unnecessary-break-statements.patch checkpatch-update-__attribute__sectionname-quote-removal.patch checkpatch-update-__attribute__sectionname-quote-removal-v2.patch checkpatch-add-__alias-and-__weak-to-suggested-__attribute__-conversions.patch checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning.patch checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning-fix.patch treewide-remove-stringification-from-__alias-macro-definition.patch