D55879.id173757.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55879.id173757.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/src/linux_seq_file.c b/sys/compat/linuxkpi/common/src/linux_seq_file.c
	--- a/sys/compat/linuxkpi/common/src/linux_seq_file.c
	+++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c
	@@ -59,15 +59,8 @@
	if (rc)
	return (rc);

	- rc = sbuf_len(sbuf);
	- if (*ppos >= rc \|\| size < 1)
	- return (-EINVAL);
	-
	- size = min(rc - *ppos, size);
	- memcpy(ubuf, sbuf_data(sbuf) + *ppos, size);
	- *ppos += size;
	-
	- return (size);
	+ return (simple_read_from_buffer(ubuf, size, ppos, sbuf_data(sbuf),
	+ sbuf_len(sbuf)));
	}

	int
	diff --git a/sys/compat/linuxkpi/common/src/linux_simple_attr.c b/sys/compat/linuxkpi/common/src/linux_simple_attr.c
	--- a/sys/compat/linuxkpi/common/src/linux_simple_attr.c
	+++ b/sys/compat/linuxkpi/common/src/linux_simple_attr.c
	@@ -119,18 +119,9 @@

	scnprintf(prebuf, sizeof(prebuf), sattr->fmt, data);

	- ret = strlen(prebuf) + 1;
	- if (*ppos >= ret \|\| read_size < 1) {
	- ret = -EINVAL;
	- goto unlock;
	- }
	-
	- read_size = min(ret - *ppos, read_size);
	- ret = strscpy(buf, prebuf + *ppos, read_size);
	-
	/* add 1 for null terminator */
	- if (ret > 0)
	- ret += 1;
	+ ret = simple_read_from_buffer(buf, read_size, ppos, prebuf,
	+ strlen(prebuf) + 1);

	unlock:
	mutex_unlock(&sattr->mutex);