diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-18 19:32:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-18 19:32:20 +0000 |
| commit | 08598453c03e28d60b4e59fd2d5c52280708f6d0 (patch) | |
| tree | 06b10e05f83ffd7d0c677eb98b35fd87b2273a93 /usr.sbin/rtadvd | |
| parent | 133978336e9ddebf7f8ddc71a0c421bc68c237af (diff) | |
correct CMSG_SPACE and CMSG_LEN handling as done in other places. These
are the complicated cases where multiple messages are sent. discussed
with kettenis, hshoexer, and rtsol tested by jmc - thanks
Diffstat (limited to 'usr.sbin/rtadvd')
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 0d24cf065cc..1738f3e662b 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.c,v 1.28 2007/01/10 08:10:47 itojun Exp $ */ +/* $OpenBSD: rtadvd.c,v 1.29 2008/03/18 19:32:18 deraadt Exp $ */ /* $KAME: rtadvd.c,v 1.66 2002/05/29 14:18:36 itojun Exp $ */ /* @@ -67,8 +67,10 @@ struct msghdr rcvmhdr; static u_char *rcvcmsgbuf; +static size_t rcvcmsgbufspace; static size_t rcvcmsgbuflen; static u_char *sndcmsgbuf = NULL; +static size_t sndcmsgbufspace; static size_t sndcmsgbuflen; volatile sig_atomic_t do_dump; volatile sig_atomic_t do_die; @@ -1295,16 +1297,20 @@ sock_open() static u_char answer[1500]; rcvcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) + - CMSG_SPACE(sizeof(int)); - rcvcmsgbuf = (u_char *)malloc(rcvcmsgbuflen); + CMSG_LEN(sizeof(int)); + rcvcmsgbufspace = CMSG_SPACE(sizeof(struct in6_pktinfo)) + + CMSG_SPACE(sizeof(int)); + rcvcmsgbuf = (u_char *)malloc(rcvcmsgbufspace); if (rcvcmsgbuf == NULL) { syslog(LOG_ERR, "<%s> not enough core", __func__); exit(1); } sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) + - CMSG_SPACE(sizeof(int)); - sndcmsgbuf = (u_char *)malloc(sndcmsgbuflen); + CMSG_LEN(sizeof(int)); + sndcmsgbufspace = CMSG_SPACE(sizeof(struct in6_pktinfo)) + + CMSG_SPACE(sizeof(int)); + sndcmsgbuf = (u_char *)malloc(sndcmsgbufspace); if (sndcmsgbuf == NULL) { syslog(LOG_ERR, "<%s> not enough core", __func__); exit(1); |