From: Bruno Haible <bruno@clisp.org>
Date: Wed, 17 Feb 2021 02:47:56 +0000 (+0100)
Subject: util: Fix file descriptor passing on 64-bit FreeBSD and NetBSD.
X-Git-Tag: v7.1.0-rc1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66611bc0df81b5b9ad0213e6302b1db5a96cb5df;p=thirdparty%2Flibvirt.git

util: Fix file descriptor passing on 64-bit FreeBSD and NetBSD.

* src/util/virsocket.c (virSocketRecvFD): Set msg.msg_controllen as documented
in the man pages.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/util/virsocket.c b/src/util/virsocket.c
index c8435a1087..b971da16e3 100644
--- a/src/util/virsocket.c
+++ b/src/util/virsocket.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2020 Red Hat, Inc.
- * Copyright (C) 2011-2020 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2021 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -457,7 +457,7 @@ virSocketRecvFD(int sock, int fdflags)
     cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
     /* Initialize the payload: */
     memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd));
-    msg.msg_controllen = cmsg->cmsg_len;
+    msg.msg_controllen = CMSG_SPACE(sizeof(fd));
 
     len = recvmsg(sock, &msg, fdflags_recvmsg);
     if (len < 0)