[dovecot-cvs] dovecot/src/lib fdpass.c,1.12,1.13

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv18375/lib

Modified Files:
	fdpass.c 
Log Message:
Have to check that msg_controllen is large enough, otherwise cmsg points to
uninitialized buffer (at least with freebsd).



Index: fdpass.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/fdpass.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fdpass.c	6 Jan 2003 20:13:58 -0000	1.12
+++ fdpass.c	8 Feb 2003 09:11:54 -0000	1.13
@@ -96,6 +96,7 @@
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
 
+	memset(buf, 0, sizeof(buf));
 	msg.msg_control = buf;
 	msg.msg_controllen = sizeof(buf);
 
@@ -107,7 +108,8 @@
 
 	/* at least one byte transferred - we should have the fd now */
 	cmsg = CMSG_FIRSTHDR(&msg);
-	if (cmsg == NULL || cmsg->cmsg_len < CMSG_LEN(sizeof(int)))
+	if (msg.msg_controllen < CMSG_SPACE(sizeof(int)) ||
+	    cmsg == NULL || cmsg->cmsg_len < CMSG_LEN(sizeof(int)))
 		*fd = -1;
 	else
 		*fd = *((int *) CMSG_DATA(cmsg));