From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRBt-0001eo-Rm for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSRBp-0004SC-0N for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:47:09 -0400 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:40540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRBo-0004Rv-Pf for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:47:04 -0400 Received: by mail-we0-f174.google.com with SMTP id t60so792256wes.19 for ; Fri, 12 Sep 2014 06:47:02 -0700 (PDT) Sender: Stratos Psomadakis Message-ID: <5412F95F.6070104@grnet.gr> Date: Fri, 12 Sep 2014 16:47:11 +0300 From: Stratos Psomadakis MIME-Version: 1.0 References: <1410448769-10495-1-git-send-email-psomas@grnet.gr> <1410448769-10495-3-git-send-email-psomas@grnet.gr> <87sijx1fqx.fsf@blackfin.pond.sub.org> <20140912083117.GB5076@noname.redhat.com> In-Reply-To: <20140912083117.GB5076@noname.redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gETFSNSdvOrnwdcU4KnWQeuBNXJ7AmiOh" Subject: Re: [Qemu-devel] [PATCH 2/2] iotests: Send the correct fd in socket_scm_helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: synnefo-devel@googlegroups.com, Markus Armbruster , Stefan Hajnoczi , qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gETFSNSdvOrnwdcU4KnWQeuBNXJ7AmiOh Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/09/2014 11:31 =CF=80=CE=BC, Kevin Wolf wrote: > Am 12.09.2014 um 09:04 hat Markus Armbruster geschrieben: >> Stratos Psomadakis 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 >>> Signed-off-by: Dimitris Aragiorgis > Thanks, applied to the block branch. > > (Also thanks to Markus for copying me, would have missed the patch > otherwise.) > >>> 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-iote= sts/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 =3D CMSG_LEN(sizeof(int)); >>> cmsg->cmsg_level =3D SOL_SOCKET; >>> cmsg->cmsg_type =3D SCM_RIGHTS; >>> - memcpy(CMSG_DATA(cmsg), &fd, sizeof(int)); >>> + memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int)); >>> =20 >>> do { >>> ret =3D sendmsg(fd, &msg, 0); >> Ouch. Do you have an idea what's broken without this fix? > As far as I can tell, nothing. Test case 045 will send a different file= > descriptor than it intended to, but the file descriptors aren't used > other than checking whether qemu correctly reports their existence, so > it doesn't matter. > > I'm not adding qemu-stable therefore. Please correct me if I'm missing > something. Right. I mentioned qemu-stable mainly for the first patch. Thanks, Stratos > > Kevin --=20 Stratos Psomadakis --gETFSNSdvOrnwdcU4KnWQeuBNXJ7AmiOh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUEvlfAAoJEO/NY8gC4r+pgdUP/0aSUEmGVCwvC3NgZ+KSH37N Cs5mDZPKHDn1tYcS2dFtiWnel5ynJVK5P8hEWPXqAoKbdi+noQL1gj98w0okb1EA QVcCOZw9bTJdw78CJCEvjujD5t+e2evEBAkwf8PEGGpDaazK9rsg5Z2mtmkoHvI7 vU3ZH1MNGZcyh5kXuNZMx1E64qCQDjbtQrPpn7iE+UcsIOFN011TMITaMdWOmU4l Y+3AbGCu+200TfeXqOIhmUEXdyuNVb/DpC90t4jotiJQXv5hZ+kvYzTGxkVSwo9z k53+OBj78iDW30lVx1UknlrX8ChqUh1jmefSYxFaITMT4ZVDX2N6NeTTJlgNhhNs gnz+2argAYKRNp/SretoEDN51TNrlQQJJG98cp2dVA4FYWZjrzQDOW6KHSinUF3D T4hCbpllb0OgMwj9qto9cNtJxLrIbl+Jkp2k49jJQN2LOygJDrtywShlIUatCVjF W02U3lc+de5PoVDSPOcwHJ0UrPHxOscpbJ7hA3mAav15YhU9qdsWe3RxQfV9eppZ 6GtlH2E8mEtzXUi0W+g8kPTxonYTXfrusE9/1rqjsVCxp6DWxTGB2MXv+0Mz+mfv gr5VMNQ6ovK5FpJa38UXCWfqRdJTdZOFN0Efm8JSjV+eyQxnenihypK/b6pvTpvT /vHJ4njirphWMG8XIkEU =SdDO -----END PGP SIGNATURE----- --gETFSNSdvOrnwdcU4KnWQeuBNXJ7AmiOh--