diff options
| author |   deraadt <deraadt@openbsd.org> | 2008-03-15 16:19:00 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2008-03-15 16:19:00 +0000 |
| commit | 6480e773b0847fd1dee674c74ce89af041f17f13 (patch) | |
| tree | 7bc1f2aa4e8684fae95acdebf66103d8c0069907 /usr.sbin/tcpdump/privsep_fdpass.c | |
| parent | Fix several CMSG-related bugs. Chaining CMSG's is tricky since you need to (diff) | |
| download | wireguard-openbsd-6480e773b0847fd1dee674c74ce89af041f17f13.tar.xz wireguard-openbsd-6480e773b0847fd1dee674c74ce89af041f17f13.zip | |
Repair the simple cases for msg_controllen where it should just be
CMSG_SIZE(sizeof(int)), not sizeof(buffer) which may be larger because
of alignment; ok kettenis hshoexer
Diffstat (limited to 'usr.sbin/tcpdump/privsep_fdpass.c')
| -rw-r--r-- | usr.sbin/tcpdump/privsep_fdpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/tcpdump/privsep_fdpass.c b/usr.sbin/tcpdump/privsep_fdpass.c index 8dde85d5c9d..bba8d85e4b9 100644 --- a/usr.sbin/tcpdump/privsep_fdpass.c +++ b/usr.sbin/tcpdump/privsep_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep_fdpass.c,v 1.5 2008/03/13 01:49:53 deraadt Exp $ */ +/* $OpenBSD: privsep_fdpass.c,v 1.6 2008/03/15 16:19:02 deraadt Exp $ */ /* * Copyright (c) 2002 Matthieu Herrb @@ -46,7 +46,7 @@ send_fd(int sock, int fd) if (fd >= 0) { msg.msg_control = (caddr_t)&cmsgbuf.buf; - msg.msg_controllen = sizeof(cmsgbuf.buf); + msg.msg_controllen = CMSG_LEN(sizeof(int)); cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_level = SOL_SOCKET; @@ -87,7 +87,7 @@ receive_fd(int sock) msg.msg_iov = &vec; msg.msg_iovlen = 1; msg.msg_control = &cmsgbuf.buf; - msg.msg_controllen = sizeof(cmsgbuf.buf); + msg.msg_controllen = CMSG_LEN(sizeof(int)); if ((n = recvmsg(sock, &msg, 0)) == -1) warn("%s: recvmsg", __func__); |