From f92e063872ffc12fd82be7e344e8aeeeefd7a8ee Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 27 Mar 2008 10:53:23 +1100 Subject: [PATCH] - deraadt@cvs.openbsd.org 2008/03/13 01:49:53 [monitor_fdpass.c] Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to an extensive discussion with otto, kettenis, millert, and hshoexer --- ChangeLog | 6 +++++- monitor_fdpass.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03635b5e3..4d222aa98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,10 @@ [ssh.1 sshd.8 sshd_config.5] bump Mdocdate for pages committed in "febuary", necessary because of a typo in rcs.c; + - deraadt@cvs.openbsd.org 2008/03/13 01:49:53 + [monitor_fdpass.c] + Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to + an extensive discussion with otto, kettenis, millert, and hshoexer 20080315 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are @@ -3777,4 +3781,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4882 2008/03/26 23:50:21 djm Exp $ +$Id: ChangeLog,v 1.4883 2008/03/26 23:53:23 djm Exp $ diff --git a/monitor_fdpass.c b/monitor_fdpass.c index fb00ab7ab..a3e995df8 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.14 2008/03/02 18:19:35 deraadt Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.15 2008/03/13 01:49:53 deraadt Exp $ */ /* * Copyright 2001 Niels Provos * All rights reserved. @@ -52,7 +52,8 @@ mm_send_fd(int sock, int fd) union { struct cmsghdr hdr; char tmp[CMSG_SPACE(sizeof(int))]; - } tmp; + char buf[CMSG_SPACE(sizeof(int))]; + } cmsgbuf; struct cmsghdr *cmsg; #endif @@ -61,8 +62,8 @@ mm_send_fd(int sock, int fd) msg.msg_accrights = (caddr_t)&fd; msg.msg_accrightslen = sizeof(fd); #else - msg.msg_control = (caddr_t)&tmp; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_control = (caddr_t)&cmsgbuf.buf; + msg.msg_controllen = sizeof(cmsgbuf.buf); cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_level = SOL_SOCKET; @@ -104,9 +105,9 @@ mm_receive_fd(int sock) int fd; #ifndef HAVE_ACCRIGHTS_IN_MSGHDR union { - char tmp[CMSG_SPACE(sizeof(int))]; struct cmsghdr hdr; - } tmp; + char buf[CMSG_SPACE(sizeof(int))]; + } cmsgbuf; struct cmsghdr *cmsg; #endif @@ -119,8 +120,8 @@ mm_receive_fd(int sock) msg.msg_accrights = (caddr_t)&fd; msg.msg_accrightslen = sizeof(fd); #else - msg.msg_control = &tmp; - msg.msg_controllen = sizeof(tmp); + msg.msg_control = &cmsgbuf.buf; + msg.msg_controllen = sizeof(cmsgbuf.buf); #endif if ((n = recvmsg(sock, &msg, 0)) == -1) {