This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fix SEGV by setting msg_controllen earlier.

- Some implementations of CMSG_FIRSTHDR() rely on msg_controllen being
  set correctly, else it returns NULL: see <linux/socket.h>.
  • Loading branch information...
pgriess authored and ry committed May 4, 2010
1 parent 1a31713 commit d9882395e2ceb0274e15a3ba80df900d1e527c0d
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/node_net2.cc
View
@@ -671,12 +671,12 @@ static Handle<Value> SendFD(const Arguments& args) {
msg.msg_namelen = 0;
msg.msg_flags = 0;
msg.msg_control = (void *) control_msg;
+ msg.msg_controllen = CMSG_LEN(sizeof(fd_to_send));
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
- cmsg->cmsg_len = CMSG_LEN(sizeof(fd_to_send));
+ cmsg->cmsg_len = msg.msg_controllen;
*(int*) CMSG_DATA(cmsg) = fd_to_send;
- msg.msg_controllen = cmsg->cmsg_len;
ssize_t written = sendmsg(fd, &msg, 0);

0 comments on commit d988239

Please sign in to comment.