isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intercept_fd_cb: store the passed fd in newfd, not fd

Browse Source 
only affects the old BSD-style fd passing code, not POSIX-style.
This commit is contained in:
Todd C. Miller
2021-08-19 13:10:44 -06:00
parent d333f484ec
commit 5d3ab032f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/exec_intercept.c
View File

@@ -579,8 +579,8 @@ intercept_fd_cb(int fd, int what, void *v)
msg.msg_control = &cmsgbuf.buf; msg.msg_control = &cmsgbuf.buf;
msg.msg_controllen = sizeof(cmsgbuf.buf); msg.msg_controllen = sizeof(cmsgbuf.buf);
#else #else
msg.msg_accrights = (caddr_t)&fd; msg.msg_accrights = (caddr_t)&newfd;
msg.msg_accrightslen = sizeof(fd); msg.msg_accrightslen = sizeof(newfd);
#endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */ #endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */
switch (recvmsg(fd, &msg, 0)) { switch (recvmsg(fd, &msg, 0)) {
@@ -616,7 +616,7 @@ intercept_fd_cb(int fd, int what, void *v)
} }
memcpy(&newfd, CMSG_DATA(cmsg), sizeof(newfd)); memcpy(&newfd, CMSG_DATA(cmsg), sizeof(newfd));
#else #else
if (msg.msg_accrightslen != sizeof(fd)) { if (msg.msg_accrightslen != sizeof(newfd)) {
sudo_warnx(U_("%s: missing message header"), __func__); sudo_warnx(U_("%s: missing message header"), __func__);
goto bad; goto bad;
} }