Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly fix the variable stack allocation code.

This commit is contained in:
christos 2008-03-28 21:18:45 +00:00
parent 8f949a45b8
commit 5ae92982aa
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/dist/ipsec-tools/src/racoon/privsep.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: privsep.c,v 1.9 2008/03/28 20:28:14 manu Exp $ */
/* $NetBSD: privsep.c,v 1.10 2008/03/28 21:18:45 christos Exp $ */
/* Id: privsep.c,v 1.15 2005/08/08 11:23:44 vanhu Exp */
@ -1583,20 +1583,25 @@ rec_fd(s)
struct msghdr msg;
struct cmsghdr *cmsg;
int fd;
char cmsbuf[CMSG_SPACE(sizeof(fd))];
char cmsbuf[1024];
struct iovec iov;
char iobuf[1];
iov.iov_base = iobuf;
iov.iov_len = 1;
if (sizeof(cmsbuf) < CMSG_SPACE(sizeof(fd))) {
plog(LLV_ERROR, LOCATION, NULL,
"send_fd: buffer size too small\n");
return -1;
}
bzero(&msg, sizeof(msg));
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsbuf;
msg.msg_controllen = sizeof(cmsbuf);
msg.msg_controllen = CMSG_SPACE(sizeof(fd));
if (recvmsg(s, &msg, MSG_WAITALL) == -1)
return -1;
@ -1613,12 +1618,17 @@ send_fd(s, fd)
{
struct msghdr msg;
struct cmsghdr *cmsg;
char cmsbuf[CMSG_SPACE(sizeof(fd))];
char cmsbuf[1024];
struct iovec iov;
iov.iov_base = " ";
iov.iov_len = 1;
if (sizeof(cmsbuf) < CMSG_SPACE(sizeof(fd))) {
plog(LLV_ERROR, LOCATION, NULL,
"send_fd: buffer size too small\n");
return -1;
}
bzero(&msg, sizeof(msg));
msg.msg_name = NULL;
msg.msg_namelen = 0;