diff options
| author | robert <robert@FreeBSD.org> | 2002-10-17 20:03:38 +0000 |
|---|---|---|
| committer | robert <robert@FreeBSD.org> | 2002-10-17 20:03:38 +0000 |
| commit | 1e0cdb534a593672b1178f980abd762bd316b57d (patch) | |
| tree | 0a05cf96e39ba02857dd2294138be9f6e7f278ad /sys/kern/kern_proc.c | |
| parent | 5e20feda93dab6d1a2a9c89e8f6a255504b3c3a3 (diff) | |
| download | FreeBSD-src-1e0cdb534a593672b1178f980abd762bd316b57d.zip FreeBSD-src-1e0cdb534a593672b1178f980abd762bd316b57d.tar.gz | |
Use strlcpy() instead of strncpy() to copy NUL terminated strings
for safety and consistency.
Diffstat (limited to 'sys/kern/kern_proc.c')
| -rw-r--r-- | sys/kern/kern_proc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 345ee22..66b3c79 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -921,13 +921,13 @@ fill_kinfo_proc(p, kp) } if (!(p->p_flag & P_KSES)) { if (td->td_wmesg != NULL) { - strncpy(kp->ki_wmesg, td->td_wmesg, - sizeof(kp->ki_wmesg) - 1); + strlcpy(kp->ki_wmesg, td->td_wmesg, + sizeof(kp->ki_wmesg)); } if (TD_ON_LOCK(td)) { kp->ki_kiflag |= KI_LOCKBLOCK; - strncpy(kp->ki_lockname, td->td_lockname, - sizeof(kp->ki_lockname) - 1); + strlcpy(kp->ki_lockname, td->td_lockname, + sizeof(kp->ki_lockname)); } } @@ -1002,8 +1002,8 @@ fill_kinfo_proc(p, kp) if (sp != NULL) { kp->ki_sid = sp->s_sid; SESS_LOCK(sp); - strncpy(kp->ki_login, sp->s_login, - sizeof(kp->ki_login) - 1); + strlcpy(kp->ki_login, sp->s_login, + sizeof(kp->ki_login)); if (sp->s_ttyvp) kp->ki_kiflag |= KI_CTTY; if (SESS_LEADER(p)) @@ -1020,8 +1020,8 @@ fill_kinfo_proc(p, kp) } else kp->ki_tdev = NOUDEV; if (p->p_comm[0] != '\0') { - strncpy(kp->ki_comm, p->p_comm, sizeof(kp->ki_comm) - 1); - strncpy(kp->ki_ocomm, p->p_comm, sizeof(kp->ki_ocomm) - 1); + strlcpy(kp->ki_comm, p->p_comm, sizeof(kp->ki_comm)); + strlcpy(kp->ki_ocomm, p->p_comm, sizeof(kp->ki_ocomm)); } kp->ki_siglist = p->p_siglist; kp->ki_sigmask = p->p_sigmask; |
