iotests: Send the correct fd in socket_scm_helper
authorStratos Psomadakis <psomas@grnet.gr>
Thu, 11 Sep 2014 15:19:29 +0000 (18:19 +0300)
committerKevin Wolf <kwolf@redhat.com>
Fri, 12 Sep 2014 08:27:54 +0000 (10:27 +0200)
Make sure to pass the correct fd via SCM_RIGHTS in socket_scm_helper.c
(i.e. fd_to_send, not socket-fd).

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tests/qemu-iotests/socket_scm_helper.c

index 0e2b285..8195983 100644 (file)
@@ -52,7 +52,7 @@ static int send_fd(int fd, int fd_to_send)
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
-    memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
+    memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int));
 
     do {
         ret = sendmsg(fd, &msg, 0);