breeze/openssh-portable
1
0
Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-01-12 00:04:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2008/03/02 18:19:35

Browse Source 
[monitor_fdpass.c]
     use a union to ensure alignment of the cmsg (pay attention: various other
     parts of the tree need this treatment too); ok djm
This commit is contained in:
Damien Miller
2008-03-07 18:35:26 +11:00
parent 7c29661471
commit c0c53c3114
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
monitor_fdpass.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: monitor_fdpass.c,v 1.13 2007/09/04 03:21:03 djm Exp $ */
/* $OpenBSD: monitor_fdpass.c,v 1.14 2008/03/02 18:19:35 deraadt Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -49,7 +49,10 @@ mm_send_fd(int sock, int fd)
char ch = '\0';
ssize_t n;
#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
char tmp[CMSG_SPACE(sizeof(int))];
union {
struct cmsghdr hdr;
char tmp[CMSG_SPACE(sizeof(int))];
} tmp;
struct cmsghdr *cmsg;
#endif
@@ -58,7 +61,7 @@ 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_control = (caddr_t)&tmp;
msg.msg_controllen = CMSG_LEN(sizeof(int));
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
@@ -100,7 +103,10 @@ mm_receive_fd(int sock)
char ch;
int fd;
#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
char tmp[CMSG_SPACE(sizeof(int))];
union {
char tmp[CMSG_SPACE(sizeof(int))];
struct cmsghdr hdr;
} tmp;
struct cmsghdr *cmsg;
#endif
@@ -113,7 +119,7 @@ mm_receive_fd(int sock)
msg.msg_accrights = (caddr_t)&fd;
msg.msg_accrightslen = sizeof(fd);
#else
msg.msg_control = tmp;
msg.msg_control = &tmp;
msg.msg_controllen = sizeof(tmp);
#endif