Re: [Qemu-devel] [PATCH 2/2] iotests: Send the correct fd in socket_scm_helper

From: Markus Armbruster <armbru@redhat.com>
To: Stratos Psomadakis <psomas@grnet.gr>
Cc: Kevin Wolf <kwolf@redhat.com>,
	synnefo-devel@googlegroups.com, qemu-devel@nongnu.org,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 2/2] iotests: Send the correct fd in socket_scm_helper
Date: Fri, 12 Sep 2014 09:04:38 +0200	[thread overview]
Message-ID: <87sijx1fqx.fsf@blackfin.pond.sub.org> (raw)
In-Reply-To: <1410448769-10495-3-git-send-email-psomas@grnet.gr> (Stratos Psomadakis's message of "Thu, 11 Sep 2014 18:19:29 +0300")

Stratos Psomadakis <psomas@grnet.gr> writes:

> 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>
> ---
>  tests/qemu-iotests/socket_scm_helper.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c
> index 0e2b285..8195983 100644
> --- a/tests/qemu-iotests/socket_scm_helper.c
> +++ b/tests/qemu-iotests/socket_scm_helper.c
> @@ -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);

Ouch.  Do you have an idea what's broken without this fix?