diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-05-21 13:35:16 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-05-21 13:35:16 +0000 |
| commit | 750f1f5b14cf27229ea0fa2dc0dd16b35bc8be19 (patch) | |
| tree | a54ae36204d4666eb49a1f60c377ac4e0c575385 /sys/kern | |
| parent | b9ce6f95837814db6c9ce54806213ee31c9ecb0c (diff) | |
Rename caddr_t p to cp in an inner block to avoid aliasing the outer
struct proc *p, ok deraadt
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 25f48e51347..2bbe4c87c18 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.101 2015/05/06 08:52:17 mpi Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.102 2015/05/21 13:35:15 nicm Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -759,7 +759,7 @@ recvit(struct proc *p, int s, struct msghdr *mp, caddr_t namelenp, len = 0; else { struct mbuf *m = control; - caddr_t p = mp->msg_control; + caddr_t cp = mp->msg_control; do { i = m->m_len; @@ -767,15 +767,15 @@ recvit(struct proc *p, int s, struct msghdr *mp, caddr_t namelenp, mp->msg_flags |= MSG_CTRUNC; i = len; } - error = copyout(mtod(m, caddr_t), p, i); + error = copyout(mtod(m, caddr_t), cp, i); if (m->m_next) i = ALIGN(i); - p += i; + cp += i; len -= i; if (error != 0 || len <= 0) break; } while ((m = m->m_next) != NULL); - len = p - (caddr_t)mp->msg_control; + len = cp - (caddr_t)mp->msg_control; } mp->msg_controllen = len; } |