Attachment 1480 Details for Bug 1453 – Revert CMSG twiddling

[patch] Revert CMSG twiddling

revert-fdpass.diff (text/plain), 1.18 KB, created by Damien Miller on 2008-04-01 12:44:53 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2008-04-01 12:44:53 AEDT

Size: 1.18 KB

patch

obsolete

>Index: monitor_fdpass.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/monitor_fdpass.c,v
>retrieving revision 1.17
>retrieving revision 1.16
>diff -u -p -r1.17 -r1.16
>--- monitor_fdpass.c	24 Mar 2008 16:11:07 -0000	1.17
>+++ monitor_fdpass.c	15 Mar 2008 16:19:02 -0000	1.16
>@@ -1,4 +1,4 @@
>-/* $OpenBSD: monitor_fdpass.c,v 1.17 2008/03/24 16:11:07 deraadt Exp $ */
>+/* $OpenBSD: monitor_fdpass.c,v 1.16 2008/03/15 16:19:02 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 = 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;
>@@ -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 = sizeof(cmsgbuf.buf);
>+	msg.msg_controllen = CMSG_LEN(sizeof(int));
> 
> 	if ((n = recvmsg(sock, &msg, 0)) == -1) {
> 		error("%s: recvmsg: %s", __func__, strerror(errno));

Actions: View | Diff

Attachments on bug 1453: 1479 | 1480