commit 945001a1af36eafd093b6b1582f5282932cd3d87
author Marc-André Lureau <marcandre.lureau@redhat.com> Tue Jun 23 12:55:41 2015 +0200
committer Marc-André Lureau <marcandre.lureau@redhat.com> Sat Oct 24 18:02:49 2015 +0200
tree 2141a00cef0f4d8f0afc7a4888210aeb929b8ab2
parent 86d471bfa4262fa983c0214ace7336843e2181a2

ivshmem: check shm isn't already initialized

The server should not change the shm, and this isn't handled by qemu and
we should should verify this in qemu.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>

hw/misc/ivshmem.c

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index d3d0204..9023f95 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -533,6 +533,12 @@
     if (incoming_posn == -1) {
         void * map_ptr;
 
+        if (s->shm_fd >= 0) {
+            error_report("shm already initialized");
+            close(incoming_fd);
+            return;
+        }
+
         if (check_shm_size(s, incoming_fd, &err) == -1) {
             error_report_err(err);
             close(incoming_fd);