xnu-6153.81.5.tar.gz

[apple/xnu.git] / bsd / kern / kern_xxx.c

diff --git a/bsd/kern/kern_xxx.c b/bsd/kern/kern_xxx.c
index ee65deb6c97bf6f7ce27dc6439afb261cb940023..a07457cd6d6f146b50e47a28f006579db150d5da 100644 (file)
--- a/bsd/kern/kern_xxx.c
+++ b/bsd/kern/kern_xxx.c
@@ -116,8 +116,11 @@ reboot(struct proc *p, struct reboot_args *uap, __unused int32_t *retval)
        }
 
        if (uap->opt & RB_PANIC && uap->msg != USER_ADDR_NULL) {
-               if (copyinstr(uap->msg, (void *)message, sizeof(message), (size_t *)&dummy)) {
+               int copy_error = copyinstr(uap->msg, (void *)message, sizeof(message), (size_t *)&dummy);
+               if (copy_error != 0 && copy_error != ENAMETOOLONG) {
                        strncpy(message, "user space RB_PANIC message copyin failed", sizeof(message) - 1);
+               } else {
+                       message[sizeof(message) - 1] = '\0';
                }
        }