From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf4rc-0008HP-Q3 for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:39:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf4rc-0006w9-1j for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:39:00 -0400 Received: from mail-qg0-x22b.google.com ([2607:f8b0:400d:c04::22b]:34190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf4rb-0006w1-UO for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:38:59 -0400 Received: by qgez77 with SMTP id z77so41612708qge.1 for ; Thu, 24 Sep 2015 04:38:59 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Thu, 24 Sep 2015 13:37:27 +0200 Message-Id: <1443094669-4144-26-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 25/47] ivshmem: check shm isn't already initialized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau The server should not change the shm, and this isn't handled by qemu. Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index ea80548..21ef260 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -533,6 +533,12 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) 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); -- 2.4.3