EDAC/mc_sysfs: Add missing newlines when printing {max,dimm}_location (e6bbde8b) · Commits · 戴 / test

Reading those sysfs entries gives: [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location memory 0 [root@localhost /]# Add newlines after the value it prints for better readability. [ bp: Make len a signed int and change the check to catch wraparound. Increment the pointer p only when the length check passes. Use scnprintf(). ] Signed-off-by:

Xiongfeng Wang <wangxiongfeng2@huawei.com> Signed-off-by:

Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/1600051734-8993-1-git-send-email-wangxiongfeng2@huawei.com

drivers/edac/edac_mc_sysfs.c

+17 −5

Original line number	Diff line number	Diff line
		@@ -474,8 +474,12 @@ static ssize_t dimmdev_location_show(struct device *dev,
		struct device_attribute mattr, char data)
		{
		struct dimm_info *dimm = to_dimm(dev);
		ssize_t count;

		return edac_dimm_info_location(dimm, data, PAGE_SIZE);
		count = edac_dimm_info_location(dimm, data, PAGE_SIZE);
		count += scnprintf(data + count, PAGE_SIZE - count, "\n");

		return count;
		}

		static ssize_t dimmdev_label_show(struct device *dev,
		@@ -813,15 +817,23 @@ static ssize_t mci_max_location_show(struct device *dev,
		char *data)
		{
		struct mem_ctl_info *mci = to_mci(dev);
		int i;
		int len = PAGE_SIZE;
		char *p = data;
		int i, n;

		for (i = 0; i < mci->n_layers; i++) {
		p += sprintf(p, "%s %d ",
		n = scnprintf(p, len, "%s %d ",
		edac_layer_name[mci->layers[i].type],
		mci->layers[i].size - 1);
		len -= n;
		if (len <= 0)
		goto out;

		p += n;
		}

		p += scnprintf(p, len, "\n");
		out:
		return p - data;
		}

Admin message