From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39962)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1XSKub-0003sE-6o
	for qemu-devel@nongnu.org; Fri, 12 Sep 2014 03:04:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1XSKuV-00088G-TH
	for qemu-devel@nongnu.org; Fri, 12 Sep 2014 03:04:53 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39017)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1XSKuV-00088B-Ls
	for qemu-devel@nongnu.org; Fri, 12 Sep 2014 03:04:47 -0400
From: Markus Armbruster <armbru@redhat.com>
References: <1410448769-10495-1-git-send-email-psomas@grnet.gr>
	<1410448769-10495-3-git-send-email-psomas@grnet.gr>
Date: Fri, 12 Sep 2014 09:04:38 +0200
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")
Message-ID: <87sijx1fqx.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Qemu-devel] [PATCH 2/2] iotests: Send the correct fd in
	socket_scm_helper
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
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>

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?