From 973c39115cb308b6b1fe64b4f342996f3eef06d0 Mon Sep 17 00:00:00 2001

From: Joe Perches <joe@perches.com>

Date: Wed, 16 Sep 2020 13:40:40 -0700

Subject: [PATCH] drivers core: Remove strcat uses around sysfs_emit and neaten

Git-commit: 973c39115cb308b6b1fe64b4f342996f3eef06d0

Patch-mainline: v5.10-rc1

References: bsc#1200598 cve-2022-20166

strcat is no longer necessary for sysfs_emit and sysfs_emit_at uses.

Convert the strcat uses to sysfs_emit calls and neaten other block

uses of direct returns to use an intermediate const char *.

Signed-off-by: Joe Perches <joe@perches.com>

Link: https://lore.kernel.org/r/5d606519698ce4c8f1203a2b35797d8254c6050a.1600285923.git.joe@perches.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Petr Mladek <pmladek@suse.com>

[ pmladek@suse.com: Removed changes where the buffer could never overflow. ]

---

 drivers/base/memory.c |   33 ++++++++++++++++-----------------

 1 file changed, 16 insertions(+), 17 deletions(-)

--- a/drivers/base/memory.c

+++ b/drivers/base/memory.c

@@ -379,17 +379,16 @@ static ssize_t phys_device_show(struct d

 }

 #ifdef CONFIG_MEMORY_HOTREMOVE

-static void print_allowed_zone(char *buf, int nid, unsigned long start_pfn,

-		unsigned long nr_pages, int online_type,

-		struct zone *default_zone)

+static int print_allowed_zone(char *buf, int len, int nid,

+			      unsigned long start_pfn, unsigned long nr_pages,

+			      int online_type, struct zone *default_zone)

 {

 	struct zone *zone;

 	zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);

-	if (zone != default_zone) {

-		strcat(buf, " ");

-		strcat(buf, zone->name);

-	}

+	if (zone == default_zone)

+		return 0;

+	return sysfs_emit_at(buf, len, " %s", zone->name);

 }

 static ssize_t valid_zones_show(struct device *dev,

@@ -400,6 +399,7 @@ static ssize_t valid_zones_show(struct d

 	unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;

 	unsigned long valid_start_pfn, valid_end_pfn;

 	struct zone *default_zone;

+	int len = 0;

 	int nid;

 	/*

@@ -413,24 +413,23 @@ static ssize_t valid_zones_show(struct d

 		 */

 		if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages,

 					  &valid_start_pfn, &valid_end_pfn))

-			return sysfs_emit(buf, "none\n");

+			return sysfs_emit(buf, "%s\n", "none");

 		start_pfn = valid_start_pfn;

-		strcat(buf, page_zone(pfn_to_page(start_pfn))->name);

+		len += sysfs_emit_at(buf, len, "%s", page_zone(pfn_to_page(start_pfn))->name);

 		goto out;

 	}

 	nid = mem->nid;

 	default_zone = zone_for_pfn_range(MMOP_ONLINE_KEEP, nid, start_pfn, nr_pages);

-	strcat(buf, default_zone->name);

-	print_allowed_zone(buf, nid, start_pfn, nr_pages, MMOP_ONLINE_KERNEL,

-			default_zone);

-	print_allowed_zone(buf, nid, start_pfn, nr_pages, MMOP_ONLINE_MOVABLE,

-			default_zone);

+	len += sysfs_emit_at(buf, len, "%s", default_zone->name);

+	len += print_allowed_zone(buf, len, nid, start_pfn, nr_pages, MMOP_ONLINE_KERNEL,

+				  default_zone);

+	len += print_allowed_zone(buf, len, nid, start_pfn, nr_pages, MMOP_ONLINE_MOVABLE,

+				  default_zone);

 out:

-	strcat(buf, "\n");

-

-	return strlen(buf);

+	len += sysfs_emit_at(buf, len, "%s", "\n");

+	return len;

 }

 static DEVICE_ATTR_RO(valid_zones);

 #endif