From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aftoF-0006rm-LN for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afto8-0001qz-LQ for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afto8-0001qi-Gh for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:04 -0400 From: Markus Armbruster Date: Tue, 15 Mar 2016 19:34:42 +0100 Message-Id: <1458066895-20632-28-git-send-email-armbru@redhat.com> In-Reply-To: <1458066895-20632-1-git-send-email-armbru@redhat.com> References: <1458066895-20632-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 27/40] ivshmem: Rely on server sending the ID right after the version List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, cam@cs.ualberta.ca, mlureau@redhat.com, david.marchand@6wind.com, pbonzini@redhat.com The protocol specification (ivshmem-spec.txt, formerly ivshmem_device_spec.txt) has always required the ID message to be sent right at the beginning, and ivshmem-server has always complied. The device, however, accepts it out of order. If an interrupt setup arrived before it, though, it would be misinterpreted as connect notification. Fix the latent bug by relying on the spec and ivshmem-server's actual behavior. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/misc/ivshmem.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 7f439c3..da32a74 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -653,8 +653,6 @@ static void process_msg(IVShmemState *s, int64_t msg,= int fd, Error **errp) =20 if (fd >=3D 0) { process_msg_connect(s, msg, fd, errp); - } else if (s->vm_id =3D=3D -1) { - s->vm_id =3D msg; } else { process_msg_disconnect(s, msg, errp); } @@ -722,6 +720,30 @@ static void ivshmem_recv_setup(IVShmemState *s, Erro= r **errp) } =20 /* + * ivshmem-server sends the remaining initial messages in a fixed + * order, but the device has always accepted them in any order. + * Stay as compatible as practical, just in case people use + * servers that behave differently. + */ + + /* + * ivshmem_device_spec.txt has always required the ID message + * right here, and ivshmem-server has always complied. However, + * older versions of the device accepted it out of order, but + * broke when an interrupt setup message arrived before it. + */ + msg =3D ivshmem_recv_msg(s, &fd, &err); + if (err) { + error_propagate(errp, err); + return; + } + if (fd !=3D -1 || msg < 0 || msg > IVSHMEM_MAX_PEERS) { + error_setg(errp, "server sent invalid ID message"); + return; + } + s->vm_id =3D msg; + + /* * Receive more messages until we got shared memory. */ do { @@ -956,7 +978,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) =20 /* we allocate enough space for 16 peers and grow as needed */ resize_peers(s, 16); - s->vm_id =3D -1; =20 pci_register_bar(dev, 2, attr, &s->bar); =20 --=20 2.4.3