[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 26/51] ivshmem: check shm isn't already initialize
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v3 26/51] ivshmem: check shm isn't already initialized |
Date: |
Tue, 13 Oct 2015 16:25:53 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
hw/misc/ivshmem.c | 6 ++++++
1 file changed, 6 insertions(+)
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 @@ 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
- [Qemu-devel] [PULL v3 11/51] ivshmem: remove last exit(1), (continued)
- [Qemu-devel] [PULL v3 11/51] ivshmem: remove last exit(1), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 15/51] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 18/51] ivshmem: improve debug messages, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 17/51] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 21/51] ivshmem: simplify a bit the code, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 23/51] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 22/51] ivshmem: use common return, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 19/51] ivshmem: improve error handling, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 25/51] ivshmem: shmfd can be 0, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 20/51] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 26/51] ivshmem: check shm isn't already initialized,
marcandre . lureau <=
- [Qemu-devel] [PULL v3 24/51] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 28/51] ivshmem: fix pci_ivshmem_exit(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 31/51] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 35/51] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 29/51] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 34/51] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 30/51] ivshmem: error on too many eventfd received, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 33/51] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 43/51] tests: add ivshmem qtest, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 44/51] ivshmem: do not keep shm_fd open, marcandre . lureau, 2015/10/13