diff options
| author |   deraadt <deraadt@openbsd.org> | 2008-03-24 16:10:55 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2008-03-24 16:10:55 +0000 |
| commit | da15c7b92fde251b1a299693e955917f5aad6df0 (patch) | |
| tree | 1d86283d59f1d1f4553cd8a4f1f23b37e3de5f92 /usr.bin/ssh/monitor_fdpass.c | |
| parent | We were led astray (like many others before us) to believe that (diff) | |
| download | wireguard-openbsd-da15c7b92fde251b1a299693e955917f5aad6df0.tar.xz wireguard-openbsd-da15c7b92fde251b1a299693e955917f5aad6df0.zip | |
msg_controllen has to be CMSG_SPACE so that the kernel can account for
each cmsg_len (ie. msg_controllen = sum of CMSG_ALIGN(cmsg_len). This
works now that kernel fd passing has been fixed to accept a bit of
sloppiness because of this ABI repair.
lots of discussion with kettenis
Diffstat (limited to 'usr.bin/ssh/monitor_fdpass.c')
| -rw-r--r-- | usr.bin/ssh/monitor_fdpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/monitor_fdpass.c b/usr.bin/ssh/monitor_fdpass.c index 24cd59800db..ea6def12f4e 100644 --- a/usr.bin/ssh/monitor_fdpass.c +++ b/usr.bin/ssh/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.16 2008/03/15 16:19:02 deraadt Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.17 2008/03/24 16:11:07 deraadt Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -50,7 +50,7 @@ mm_send_fd(int sock, int fd) memset(&msg, 0, sizeof(msg)); msg.msg_control = (caddr_t)&cmsgbuf.buf; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_controllen = sizeof(cmsgbuf.buf); cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_level = SOL_SOCKET; @@ -96,7 +96,7 @@ mm_receive_fd(int sock) msg.msg_iov = &vec; msg.msg_iovlen = 1; msg.msg_control = &cmsgbuf.buf; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_controllen = sizeof(cmsgbuf.buf); if ((n = recvmsg(sock, &msg, 0)) == -1) { error("%s: recvmsg: %s", __func__, strerror(errno)); |