diff options
| author |   deraadt <deraadt@openbsd.org> | 2008-03-15 16:24:58 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2008-03-15 16:24:58 +0000 |
| commit | ab3651eb083efd2fd0cb3b11f10d41dbb487ef9c (patch) | |
| tree | fd47f396f559c0b803955fd8f5e0f6fd5f509c65 /usr.sbin/ospf6d/packet.c | |
| parent | repair msg_controllen and also an errant buf[CMSG_LEN(..)] decl (diff) | |
| download | wireguard-openbsd-ab3651eb083efd2fd0cb3b11f10d41dbb487ef9c.tar.xz wireguard-openbsd-ab3651eb083efd2fd0cb3b11f10d41dbb487ef9c.zip | |
Repair more msg_controllen dealing with structures or arrays of
descriptors; ok hshoexer, also looked at by kettenis and henning
Diffstat (limited to 'usr.sbin/ospf6d/packet.c')
| -rw-r--r-- | usr.sbin/ospf6d/packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ospf6d/packet.c b/usr.sbin/ospf6d/packet.c index 96058ebfe52..d6d5e63edb9 100644 --- a/usr.sbin/ospf6d/packet.c +++ b/usr.sbin/ospf6d/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.7 2008/03/13 01:49:53 deraadt Exp $ */ +/* $OpenBSD: packet.c,v 1.8 2008/03/15 16:25:00 deraadt Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -147,7 +147,7 @@ recv_packet(int fd, short event, void *bula) msg.msg_iov = &iov; msg.msg_iovlen = 1; msg.msg_control = &cmsgbuf.buf; - msg.msg_controllen = sizeof(cmsgbuf.buf); + msg.msg_controllen = CMSG_LEN(sizeof(struct in6_pktinfo)); if ((r = recvmsg(fd, &msg, 0)) == -1) { if (errno != EAGAIN && errno != EINTR) |