From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 25 Dec 2018 15:01:18 +0000 (+0000)
Subject: sys/fdpass.c: Fix expected size of descriptor message.
X-Git-Tag: 2.3.3~3
X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/commitdiff_plain/3c9c17a11ff7c6122f99ea4f9d02a63a6bcea496

sys/fdpass.c: Fix expected size of descriptor message.

This typo breaks 64-bit targets, and I'd never noticed because of
inadequate testing.
---

diff --git a/sys/fdpass.c b/sys/fdpass.c
index e860ec3..1db9210 100644
--- a/sys/fdpass.c
+++ b/sys/fdpass.c
@@ -139,7 +139,7 @@ ssize_t fdpass_recv(int sock, int *fd, void *p, size_t sz)
   for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
     if (cmsg->cmsg_level == SOL_SOCKET &&
 	cmsg->cmsg_type == SCM_RIGHTS &&
-	cmsg->cmsg_len >= CMSG_LEN(sizeof(fd))) {
+	cmsg->cmsg_len >= CMSG_LEN(sizeof(*fd))) {
       memcpy(&fdtmp, CMSG_DATA(cmsg), sizeof(fdtmp));
       if (*fd == -1)
 	*fd = fdtmp;