diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
| commit | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (patch) | |
| tree | 08368e0c4dcea4baa16f4a34b2cc104c42e1ed27 /sys/kern/kern_thr.c | |
| parent | cbeab2a9b6b7ac70992175202f35fcc05a5821d5 (diff) | |
| parent | 91f6edbb8913d163d5c16fb615e84baf8a16d390 (diff) | |
| download | FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.zip FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/kern/kern_thr.c')
| -rw-r--r-- | sys/kern/kern_thr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 74050ff..63e4ed0 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -569,8 +569,11 @@ sys_thr_set_name(struct thread *td, struct thr_set_name_args *uap) error = 0; name[0] = '\0'; if (uap->name != NULL) { - error = copyinstr(uap->name, name, sizeof(name), - NULL); + error = copyinstr(uap->name, name, sizeof(name), NULL); + if (error == ENAMETOOLONG) { + error = copyin(uap->name, name, sizeof(name) - 1); + name[sizeof(name) - 1] = '\0'; + } if (error) return (error); } |
