Skip to contentSkip to conversation

uaccess: Introduce copy_from_user_nul helper

PATCH In review Fushuai Wang 5 participants 21 messages Jan 12 – Jan 16

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover uaccess: Introduce copy_from_user_nul helper

From: Fushuai Wang <[email protected]>

Hi all,

This patch series introduces a new helper function, copy_from_user_nul, to simplify cases where a buffer copied from userspace needs to be NUL-terminated. In many places, after using copy_from_user, we manually add a NUL byte to the end of the buffer to prevent string overflows and ensure safe string handling.

The new helper performs both the copy and the NUL-termination in one step, reducing repetitive code and the chance of errors.

v1 -> v2: Rewrite commit message and add some actual code improvements

--WANG

Fushuai Wang (6):
uaccess: Add copy_from_user_nul helper
x86/tlb: Use copy_from_user_nul() instead of copy_from_user()
tracing: Use copy_from_user_nul() instead of copy_from_user()
userns: Use copy_from_user_nul() instead of copy_from_user()
time: Use copy_from_user_nul() instead of copy_from_user()
kstrtox: Use copy_from_user_nul() instead of copy_from_user()

 arch/x86/mm/tlb.c         |  3 +--
 include/linux/uaccess.h   | 19 +++++++++++++++++++
 kernel/time/test_udelay.c |  3 +--
 kernel/trace/trace.c      |  3 +--
 kernel/user_namespace.c   |  3 +--
 lib/kstrtox.c             |  6 ++----
 6 files changed, 25 insertions(+), 12 deletions(-)
Signature · 1 line
2.36.1
#1 lore raw

PATCH v2 1/6 uaccess: Add copy_from_user_nul helper

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

	if (copy_from_user(dest, src, len))
		return -EFAULT;
	dest[len] = '\0';

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

---
 include/linux/uaccess.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
include/linux/uaccess.h +19 -0
index 1f3804245c06..fe9a1db600c7 100644
@@ -224,6 +224,25 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
 #endif
 }
 
+/*
+ * copy_from_user_nul - Copy a block of data from user space and NUL-terminate
+ *
+ * @to:   Destination address, in kernel space. This buffer must be at least
+ *        @n+1 bytes long!
+ * @from: Source address, in user space.
+ * @n:    Number of bytes to copy.
+ *
+ * Return: 0 on success, -EFAULT on failure.
+ */
+static __always_inline int __must_check
+copy_from_user_nul(void *to, const void __user *from, unsigned long n)
+{
+	if (copy_from_user(to, from, n))
+		return -EFAULT;
+	((char *)to)[n] = '\0';
+	return 0;
+}
+
 static __always_inline unsigned long __must_check
 copy_to_user(void __user *to, const void *from, unsigned long n)
 {
Signature · 1 line
2.36.1
#2 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 10 lines · Fushuai Wang

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

	if (copy_from_user(dest, src, len))
		return -EFAULT;
	dest[len] = '\0';
Quoted 5 lines

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

Hmm, this function is very very similar to strncpy_from_user(). Should they be using that instead?

Alice

#3 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 14 lines
Quoted 14 lines

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

	if (copy_from_user(dest, src, len))
		return -EFAULT;
	dest[len] = '\0';

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

Quoted 6 lines
Quoted 1 line

Hmm, this function is very very similar to strncpy_from_user(). Should they be using that instead?

Alice

The strncpy_from_user() is for NUL-terminated strings and stops at the first NUL in userspace. But copy_from_user_nul() always copies a fixed length and adds a NUL at the end in kernel space, even if userspace data doesn’t contain a NUL.

So I think they are for different cases and can’t replace each other.

---
Regards,
WANG

#4 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 20 lines · Fushuai Wang
Quoted 20 lines
Quoted 11 lines

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

     if (copy_from_user(dest, src, len))
             return -EFAULT;
     dest[len] = '\0';
Quoted 5 lines

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

Hmm, this function is very very similar to strncpy_from_user(). Should they be using that instead?

Quoted 8 lines
Quoted 1 line

Alice

The strncpy_from_user() is for NUL-terminated strings and stops at the first NUL in userspace. But copy_from_user_nul() always copies a fixed length and adds a NUL at the end in kernel space, even if userspace data doesn’t contain a NUL.

So I think they are for different cases and can’t replace each other.

strncpy_from_user() succeeds even if userspace data does not contain a nul. Then it reads length bytes.

As far as I can tell, when a nul byte is present, none of these kernel use-cases use data after the nul byte. So the behavior is identical except that copy_from_user_nul() may result in EFAULT if there are unmapped bytes between the first nul byte in src and src+len.

Alice

#5 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 2 lines

strncpy_from_user() succeeds even if userspace data does not contain a nul. Then it reads length bytes.

Yes, but if there is no NUL byte in the user buf, whether you use strncpy_from_user() or copy_from_user(), you need to manually add a '\0' in the kernel buf to ensure it is properly NUL-terminated. like:

	ret = strncpy_from_user(&buffer[0], arg, sizeof(buffer) - 1);
	if (ret < 0) {
		ret = -EFAULT;
		break;
	}
	buffer[sizeof(buffer) - 1] = '\0';

So I do not think copy_from_user() + '\0' can be instead of strncpy_from_user(). I think strncpy_from_user() can only be used without manually appending '\0' if someone are certain that the user buf contains a NUL byte.

---
Regards,
WANG

Quoted 6 lines

As far as I can tell, when a nul byte is present, none of these kernel use-cases use data after the nul byte. So the behavior is identical except that copy_from_user_nul() may result in EFAULT if there are unmapped bytes between the first nul byte in src and src+len.

Alice

maintainer
#6 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 6 lines · Fushuai Wang
Quoted 2 lines

strncpy_from_user() succeeds even if userspace data does not contain a nul. Then it reads length bytes.

Yes, but if there is no NUL byte in the user buf, whether you use strncpy_from_user() or copy_from_user(), you need to manually add a '\0' in the kernel buf to ensure it is properly NUL-terminated.

This looks like a bunch of churn to save a "= \0" line.

The more important question, IMO, would be whether there are cases in the kernel which *miss* a NUL termination, audit them and fix them.

That'll give you a better idea whether such a *_nul() helper is even needed.

Because converting only a handful of obvious places in the face of thousands of copy_from_user() invocations in the kernel is not doing anything useful.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#7 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 10 lines · Borislav Petkov
Quoted 6 lines · Fushuai Wang
Quoted 2 lines

strncpy_from_user() succeeds even if userspace data does not contain a nul. Then it reads length bytes.

Yes, but if there is no NUL byte in the user buf, whether you use strncpy_from_user() or copy_from_user(), you need to manually add a '\0' in the kernel buf to ensure it is properly NUL-terminated.

This looks like a bunch of churn to save a "= \0" line.

Quoted 7 lines

The more important question, IMO, would be whether there are cases in the kernel which *miss* a NUL termination, audit them and fix them.

That'll give you a better idea whether such a *_nul() helper is even needed.

Because converting only a handful of obvious places in the face of thousands of copy_from_user() invocations in the kernel is not doing anything useful.

I'm getting the impression that strncpy_from_user() is the real problem here. It should append a nul byte.

That would also be a lot less error-prone than the suggested new API. Requiring a length of N+1 is not the most immediately-obvious API.

Alice

maintainer
#8 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 5 lines · On Mon, 12 Jan 2026 15:40:53 +0000 Alice Ryhl <[email protected]> wrote:

I'm getting the impression that strncpy_from_user() is the real problem here. It should append a nul byte.

That would also be a lot less error-prone than the suggested new API. Requiring a length of N+1 is not the most immediately-obvious API.

Should we make a strscpy_from_user() API that acts the same as strscpy() but from user space?

-- Steve

#9 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 4 lines · Steven Rostedt

On Mon, 12 Jan 2026 15:40:53 +0000
Alice Ryhl <[email protected]> wrote:

Quoted 8 lines
Quoted 5 lines

I'm getting the impression that strncpy_from_user() is the real problem here. It should append a nul byte.

That would also be a lot less error-prone than the suggested new API. Requiring a length of N+1 is not the most immediately-obvious API.

Should we make a strscpy_from_user() API that acts the same as strscpy() but from user space?

Sounds quite reasonable to me.

Alice

#10 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

In reply to Fushuai Wang
Quoted 5 lines · Fushuai Wang

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

6 is not many

Quoted 10 lines
	if (copy_from_user(dest, src, len))
		return -EFAULT;
	dest[len] = '\0';

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

I checked the cases you've found, and all them clearly abuse copy_from_user(). For example, #2 in tlbflush_write_file():

        if (copy_from_user(buf, user_buf, len))
                return -EFAULT;

        buf[len] = '\0';
        if (kstrtoint(buf, 0, &ceiling))
                return -EINVAL;

should be:

        len = strncpy_from_user(buf, user_buf, len);
        if (len < 0)
                return len;

        ret = kstrtoint(buf, 0, &ceiling);
        if (ret)
                return ret;

See, if you use the right API, you don't need this weird copy_from_user_nul(). Also notice how nice the original version hides possible ERANGE in kstrtoint().

Patches #3-5 in the series again copy strings with raw non-string API, so should be converted to some flavor of strcpy().

#6 patches lib/kstrtox, which makes little sense because the whole purpose of that library is to handle raw pieces of memory as valid C strings. One would expect such patterns in library code, and I'd prefer having them explicit.

I find copy_{from,to}_user_nul() useful for objects that must be null-terminated, and may have \0 somewhere in the middle. Those are not C strings. I suspect this isn't a popular format across the kernel.

On the other hand, adding the _nul() version of copy_from_user() would make an API abuse like above simpler, which is a bad thing.

Can you drop copy_from_user_nul() and submit a series that switches string manipulations to the dedicated string functions?

Thanks,
Yury

#11 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

Quoted 40 lines · Yury Norov
Quoted 5 lines · Fushuai Wang

From: Fushuai Wang <[email protected]>

Many places call copy_from_user() to copy a buffer from user space, and then manually add a NULL terminator to the destination buffer, e.g.:

6 is not many

Quoted 10 lines
	if (copy_from_user(dest, src, len))
		return -EFAULT;
	dest[len] = '\0';

This is repetitive and error-prone. Add a copy_from_user_nul() helper to simplify such patterns. It copied n bytes from user space to kernel space, and NUL-terminates the destination buffer.

I checked the cases you've found, and all them clearly abuse copy_from_user(). For example, #2 in tlbflush_write_file():

        if (copy_from_user(buf, user_buf, len))
                return -EFAULT;

        buf[len] = '\0';
        if (kstrtoint(buf, 0, &ceiling))
                return -EINVAL;

should be:

        len = strncpy_from_user(buf, user_buf, len);
        if (len < 0)
                return len;

        ret = kstrtoint(buf, 0, &ceiling);
        if (ret)
                return ret;
Quoted 3 lines

See, if you use the right API, you don't need this weird copy_from_user_nul(). Also notice how nice the original version hides possible ERANGE in kstrtoint().

Huh, we actually already have kstrtoint_from_user, so this should be a one-liner.

#12 lore raw

Re: [PATCH v2 1/6] uaccess: Add copy_from_user_nul helper

In reply to Yury Norov
Quoted 36 lines

I checked the cases you've found, and all them clearly abuse copy_from_user(). For example, #2 in tlbflush_write_file():

        if (copy_from_user(buf, user_buf, len))
                return -EFAULT;

        buf[len] = '\0';
        if (kstrtoint(buf, 0, &ceiling))
                return -EINVAL;

should be:

        len = strncpy_from_user(buf, user_buf, len);
        if (len < 0)
                return len;

        ret = kstrtoint(buf, 0, &ceiling);
        if (ret)
                return ret;

See, if you use the right API, you don't need this weird copy_from_user_nul(). Also notice how nice the original version hides possible ERANGE in kstrtoint().

Patches #3-5 in the series again copy strings with raw non-string API, so should be converted to some flavor of strcpy().

#6 patches lib/kstrtox, which makes little sense because the whole purpose of that library is to handle raw pieces of memory as valid C strings. One would expect such patterns in library code, and I'd prefer having them explicit.

I find copy_{from,to}_user_nul() useful for objects that must be null-terminated, and may have \0 somewhere in the middle. Those are not C strings. I suspect this isn't a popular format across the kernel.

Quoted 5 lines

On the other hand, adding the _nul() version of copy_from_user() would make an API abuse like above simpler, which is a bad thing.

Can you drop copy_from_user_nul() and submit a series that switches string manipulations to the dedicated string functions?

OK, I find some misuse of strncpy_from_user() + kstrtoXXX(). I will fix them.

Regarding patches #3-5, as Steven mentioned, I believe we might need a strscpy_from_user() for these cases that copy a non-NUL-terminated string from userspace?

---
Regards,
WANG

Quoted 2 lines

Thanks,
Yury

#13 lore raw

PATCH v2 2/6 x86/tlb: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 arch/x86/mm/tlb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/mm/tlb.c +1 -2
index f5b93e01e347..ae81e5cb510e 100644
@@ -1807,10 +1807,9 @@ static ssize_t tlbflush_write_file(struct file *file,
 	int ceiling;
 
 	len = min(count, sizeof(buf) - 1);
-	if (copy_from_user(buf, user_buf, len))
+	if (copy_from_user_nul(buf, user_buf, len))
 		return -EFAULT;
 
-	buf[len] = '\0';
 	if (kstrtoint(buf, 0, &ceiling))
 		return -EINVAL;
 
Signature · 1 line
2.36.1
#14 lore raw

PATCH v2 3/6 tracing: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 kernel/trace/trace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace.c +1 -2
index baec63134ab6..b6ffd006fcf9 100644
@@ -11266,10 +11266,9 @@ ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,
 		if (size >= WRITE_BUFSIZE)
 			size = WRITE_BUFSIZE - 1;
 
-		if (copy_from_user(kbuf, buffer + done, size))
+		if (copy_from_user_nul(kbuf, buffer + done, size))
 			return -EFAULT;
 
-		kbuf[size] = '\0';
 		buf = kbuf;
 		do {
 			tmp = strchr(buf, '\n');
Signature · 1 line
2.36.1
maintainer Acked-by on v2 3/6
#15 lore raw

Re: [PATCH v2 3/6] tracing: Use copy_from_user_nul() instead of copy_from_user()

Quoted 8 lines · On Mon, 12 Jan 2026 15:30:36 +0800 Fushuai Wang <[email protected]> wrote:

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

-- Steve

Quoted 20 lines
---
 kernel/trace/trace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace.c +1 -2
index baec63134ab6..b6ffd006fcf9 100644
@@ -11266,10 +11266,9 @@ ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,
 		if (size >= WRITE_BUFSIZE)
 			size = WRITE_BUFSIZE - 1;
 
-		if (copy_from_user(kbuf, buffer + done, size))
+		if (copy_from_user_nul(kbuf, buffer + done, size))
 			return -EFAULT;
 
-		kbuf[size] = '\0';
 		buf = kbuf;
 		do {
 			tmp = strchr(buf, '\n');
#16 lore raw

Re: [PATCH v2 3/6] tracing: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang
Quoted 17 lines · Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 kernel/trace/trace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace.c +0 -0
index baec63134ab6..b6ffd006fcf9 100644

kernel/trace/trace.c ssize_t trace_parse_run_command(struct file *file, const char __user *buffer, · line 11270

Quoted 6 lines
kernel/trace/trace.c +1 -1
@@ -11266,10 +11266,9 @@ ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,
 		if (size >= WRITE_BUFSIZE)
 			size = WRITE_BUFSIZE - 1;
 
-		if (copy_from_user(kbuf, buffer + done, size))
+		if (copy_from_user_nul(kbuf, buffer + done, size))
 			return -EFAULT;

This hides the original error. Can you switch it to:

                err = copy_xxx();
                if (err)
                        return err;

I understand that in this case EFAULT is the only possible error, but the above pattern is really error-prone, and is reproduced again and again over the kernel.

Quoted 6 lines
kernel/trace/trace.c +0 -1
-		kbuf[size] = '\0';
 		buf = kbuf;
 		do {
 			tmp = strchr(buf, '\n');
Signature · 1 line
2.36.1
maintainer
#17 lore raw

Re: [PATCH v2 3/6] tracing: Use copy_from_user_nul() instead of copy_from_user()

Quoted 27 lines · On Tue, 13 Jan 2026 12:05:13 -0500 Yury Norov <[email protected]> wrote:
Quoted 17 lines · Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 kernel/trace/trace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace.c +0 -0
index baec63134ab6..b6ffd006fcf9 100644

kernel/trace/trace.c ssize_t trace_parse_run_command(struct file *file, const char __user *buffer, · line 11270

Quoted 6 lines
kernel/trace/trace.c +1 -1
@@ -11266,10 +11266,9 @@ ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,
 		if (size >= WRITE_BUFSIZE)
 			size = WRITE_BUFSIZE - 1;
 
-		if (copy_from_user(kbuf, buffer + done, size))
+		if (copy_from_user_nul(kbuf, buffer + done, size))
 			return -EFAULT;  

This hides the original error. Can you switch it to:

Quoted 3 lines
                err = copy_xxx();
                if (err)
                        return err;

No, the current way is fine. It's failing on reading user space. EFAULT is good enough.

-- Steve

Quoted 11 lines

I understand that in this case EFAULT is the only possible error, but the above pattern is really error-prone, and is reproduced again and again over the kernel.

Quoted 6 lines
kernel/trace/trace.c +0 -2
-		kbuf[size] = '\0';
 		buf = kbuf;
 		do {
 			tmp = strchr(buf, '\n');
-- 

2.36.1

#18 lore raw

PATCH v2 4/6 userns: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 kernel/user_namespace.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/user_namespace.c +1 -2
index 03cb63883d04..881a05a3502c 100644
@@ -1239,9 +1239,8 @@ ssize_t proc_setgroups_write(struct file *file, const char __user *buf,
 
 	/* What was written? */
 	ret = -EFAULT;
-	if (copy_from_user(kbuf, buf, count))
+	if (copy_from_user_nul(kbuf, buf, count))
 		goto out;
-	kbuf[count] = '\0';
 	pos = kbuf;
 
 	/* What is being requested? */
Signature · 1 line
2.36.1
#19 lore raw

PATCH v2 5/6 time: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 kernel/time/test_udelay.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/time/test_udelay.c +1 -2
index 783f2297111b..08ff8fd43471 100644
@@ -107,9 +107,8 @@ static ssize_t udelay_test_write(struct file *file, const char __user *buf,
 	if (count >= sizeof(lbuf))
 		return -EINVAL;
 
-	if (copy_from_user(lbuf, buf, count))
+	if (copy_from_user_nul(lbuf, buf, count))
 		return -EFAULT;
-	lbuf[count] = '\0';
 
 	ret = sscanf(lbuf, "%d %d", &usecs, &iters);
 	if (ret < 1)
Signature · 1 line
2.36.1
#20 lore raw

PATCH v2 6/6 kstrtox: Use copy_from_user_nul() instead of copy_from_user()

In reply to Fushuai Wang

From: Fushuai Wang <[email protected]>

Use copy_from_user_nul() instead of copy_from_user() to simplify the code.

No functional change.

---
 lib/kstrtox.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
lib/kstrtox.c +2 -4
index bdde40cd69d7..e4ee72b75e09 100644
@@ -402,9 +402,8 @@ int kstrtobool_from_user(const char __user *s, size_t count, bool *res)
 	char buf[4];
 
 	count = min(count, sizeof(buf) - 1);
-	if (copy_from_user(buf, s, count))
+	if (copy_from_user_nul(buf, s, count))
 		return -EFAULT;
-	buf[count] = '\0';
 	return kstrtobool(buf, res);
 }
 EXPORT_SYMBOL(kstrtobool_from_user);
@@ -416,9 +415,8 @@ int f(const char __user *s, size_t count, unsigned int base, type *res)	\
 	char buf[1 + sizeof(type) * 8 + 1 + 1];				\
 									\
 	count = min(count, sizeof(buf) - 1);				\
-	if (copy_from_user(buf, s, count))				\
+	if (copy_from_user_nul(buf, s, count))				\
 		return -EFAULT;						\
-	buf[count] = '\0';						\
 	return g(buf, base, res);					\
 }									\
 EXPORT_SYMBOL(f)
Signature · 1 line
2.36.1