Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce2cd63 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions 



commit aa838896d87af561a33ecefea1caa4c15a68bc47 upstream.

Convert the various sprintf fmaily calls in sysfs device show functions
to sysfs_emit and sysfs_emit_at for PAGE_SIZE buffer safety.

Done with:

$ spatch -sp-file sysfs_emit_dev.cocci --in-place --max-width=80 .

And cocci script:

$ cat sysfs_emit_dev.cocci
@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
expression chr;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	return
-	strcpy(buf, chr);
+	sysfs_emit(buf, chr);
	...>
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	sprintf(buf,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	snprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
	len =
-	scnprintf(buf, PAGE_SIZE,
+	sysfs_emit(buf,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
identifier len;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
-	len += scnprintf(buf + len, PAGE_SIZE - len,
+	len += sysfs_emit_at(buf, len,
	...);
	...>
	return len;
}

@@
identifier d_show;
identifier dev, attr, buf;
expression chr;
@@

ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf)
{
	...
-	strcpy(buf, chr);
-	return strlen(buf);
+	return sysfs_emit(buf, chr);
}

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Link: https://lore.kernel.org/r/3d033c33056d88bbe34d4ddb62afd05ee166ab9a.1600285923.git.joe@perches.com


[ Brennan : Regenerated for 4.19 to fix CVE-2022-20166 ]
Signed-off-by: default avatarBrennan Lamoreaux <blamoreaux@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ff4a06d

drivers/base/arch_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static ssize_t cpu_capacity_show(struct device *dev, 
{

	struct cpu *cpu = container_of(dev, struct cpu, dev);



	return sprintf(buf, "%lu\n", topology_get_cpu_scale(NULL, cpu->dev.id));

	return sysfs_emit(buf, "%lu\n", topology_get_cpu_scale(NULL, cpu->dev.id));

}



static ssize_t cpu_capacity_store(struct device *dev,

drivers/base/cacheinfo.c

+9 −9
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static ssize_t size_show(struct device *dev, 
{

	struct cacheinfo *this_leaf = dev_get_drvdata(dev);



	return sprintf(buf, "%uK\n", this_leaf->size >> 10);

	return sysfs_emit(buf, "%uK\n", this_leaf->size >> 10);

}



static ssize_t shared_cpumap_show_func(struct device *dev, bool list, char *buf)
@@ -402,11 +402,11 @@ static ssize_t type_show(struct device *dev, 


	switch (this_leaf->type) {

	case CACHE_TYPE_DATA:

		return sprintf(buf, "Data\n");

		return sysfs_emit(buf, "Data\n");

	case CACHE_TYPE_INST:

		return sprintf(buf, "Instruction\n");

		return sysfs_emit(buf, "Instruction\n");

	case CACHE_TYPE_UNIFIED:

		return sprintf(buf, "Unified\n");

		return sysfs_emit(buf, "Unified\n");

	default:

		return -EINVAL;

	}
@@ -420,11 +420,11 @@ static ssize_t allocation_policy_show(struct device *dev, 
	int n = 0;



	if ((ci_attr & CACHE_READ_ALLOCATE) && (ci_attr & CACHE_WRITE_ALLOCATE))

		n = sprintf(buf, "ReadWriteAllocate\n");

		n = sysfs_emit(buf, "ReadWriteAllocate\n");

	else if (ci_attr & CACHE_READ_ALLOCATE)

		n = sprintf(buf, "ReadAllocate\n");

		n = sysfs_emit(buf, "ReadAllocate\n");

	else if (ci_attr & CACHE_WRITE_ALLOCATE)

		n = sprintf(buf, "WriteAllocate\n");

		n = sysfs_emit(buf, "WriteAllocate\n");

	return n;

}
@@ -436,9 +436,9 @@ static ssize_t write_policy_show(struct device *dev, 
	int n = 0;



	if (ci_attr & CACHE_WRITE_THROUGH)

		n = sprintf(buf, "WriteThrough\n");

		n = sysfs_emit(buf, "WriteThrough\n");

	else if (ci_attr & CACHE_WRITE_BACK)

		n = sprintf(buf, "WriteBack\n");

		n = sysfs_emit(buf, "WriteBack\n");

	return n;

}

drivers/base/core.c

+4 −4
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ ssize_t device_show_ulong(struct device *dev, 
			  char *buf)

{

	struct dev_ext_attribute *ea = to_ext_attr(attr);

	return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var));

	return sysfs_emit(buf, "%lx\n", *(unsigned long *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_ulong);
@@ -1019,7 +1019,7 @@ ssize_t device_show_int(struct device *dev, 
{

	struct dev_ext_attribute *ea = to_ext_attr(attr);



	return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var));

	return sysfs_emit(buf, "%d\n", *(int *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_int);
@@ -1040,7 +1040,7 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, 
{

	struct dev_ext_attribute *ea = to_ext_attr(attr);



	return snprintf(buf, PAGE_SIZE, "%d\n", *(bool *)(ea->var));

	return sysfs_emit(buf, "%d\n", *(bool *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_bool);
@@ -1273,7 +1273,7 @@ static ssize_t online_show(struct device *dev, struct device_attribute *attr, 
	device_lock(dev);

	val = !dev->offline;

	device_unlock(dev);

	return sprintf(buf, "%u\n", val);

	return sysfs_emit(buf, "%u\n", val);

}



static ssize_t online_store(struct device *dev, struct device_attribute *attr,

drivers/base/cpu.c

+17 −17
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static ssize_t show_crash_notes(struct device *dev, struct device_attribute *att 
	 * operation should be safe. No locking required.

	 */

	addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum));

	rc = sprintf(buf, "%Lx\n", addr);

	rc = sysfs_emit(buf, "%Lx\n", addr);

	return rc;

}

static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL);
@@ -167,7 +167,7 @@ static ssize_t show_crash_notes_size(struct device *dev, 
{

	ssize_t rc;



	rc = sprintf(buf, "%zu\n", sizeof(note_buf_t));

	rc = sysfs_emit(buf, "%zu\n", sizeof(note_buf_t));

	return rc;

}

static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL);
@@ -264,7 +264,7 @@ static ssize_t print_cpus_offline(struct device *dev, 
						      nr_cpu_ids, total_cpus-1);

	}



	n += snprintf(&buf[n], len - n, "\n");

	n += sysfs_emit(&buf[n], "\n");

	return n;

}

static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);
@@ -272,7 +272,7 @@ static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL); 
static ssize_t print_cpus_isolated(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;

	int n = 0;

	cpumask_var_t isolated;



	if (!alloc_cpumask_var(&isolated, GFP_KERNEL))
@@ -280,7 +280,7 @@ static ssize_t print_cpus_isolated(struct device *dev, 


	cpumask_andnot(isolated, cpu_possible_mask,

		       housekeeping_cpumask(HK_FLAG_DOMAIN));

	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(isolated));

	n = sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(isolated));



	free_cpumask_var(isolated);
@@ -292,9 +292,9 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL); 
static ssize_t print_cpus_nohz_full(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;

	int n = 0;



	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));

	n = sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));



	return n;

}
@@ -328,7 +328,7 @@ static ssize_t print_cpu_modalias(struct device *dev, 
	ssize_t n;

	u32 i;



	n = sprintf(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:",

	n = sysfs_emit(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:",

		    CPU_FEATURE_TYPEVAL);



	for (i = 0; i < MAX_CPU_FEATURES; i++)
@@ -520,56 +520,56 @@ static void __init cpu_dev_register_generic(void) 
ssize_t __weak cpu_show_meltdown(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spectre_v1(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spectre_v2(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spec_store_bypass(struct device *dev,

					  struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_l1tf(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_mds(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_tsx_async_abort(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_itlb_multihit(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_srbds(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_mmio_stale_data(struct device *dev,

drivers/base/firmware_loader/fallback.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static ssize_t firmware_loading_show(struct device *dev, 
		loading = fw_sysfs_loading(fw_sysfs->fw_priv);

	mutex_unlock(&fw_lock);



	return sprintf(buf, "%d\n", loading);

	return sysfs_emit(buf, "%d\n", loading);

}



/* one pages buffer should be mapped/unmapped only once */