[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 24/45] ivshmem: check shm isn't already initializ
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 24/45] ivshmem: check shm isn't already initialized |
Date: |
Tue, 28 Jul 2015 02:32:36 +0200 |
From: Marc-André Lureau <address@hidden>
The server should not be allowed to change the shm, this isn't handled
by qemu (perhaps it could be though).
Signed-off-by: Marc-André Lureau <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 9085f7c..b8167d9 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -534,6 +534,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] [PATCH v2 14/45] ivshmem: remove max_peer field, (continued)
- [Qemu-devel] [PATCH v2 14/45] ivshmem: remove max_peer field, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 15/45] ivshmem: improve debug messages, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 16/45] ivshmem: improve error, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 18/45] ivshmem: add a warning if eventfd value is 0, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 17/45] ivshmem: print error on invalid peer id, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 19/45] ivshmem: beautify a bit the code, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 20/45] ivshmem: use common return, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 21/45] ivshmem: use common is_power_of_2(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 22/45] ivshmem: migrate with VMStateDescription, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 23/45] ivshmem: shmfd can be 0, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 24/45] ivshmem: check shm isn't already initialized,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 25/45] ivshmem: add device description, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 26/45] ivshmem: fix pci_ivshmem_exit(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 27/45] ivshmem: replace 'guest' for 'peer' appropriately, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 28/45] ivshmem: error on too many eventfd received, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 29/45] ivshmem: reset mask on device reset, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 31/45] ivshmem-client: check the number of vectors, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 32/45] ivshmem-server: use a uint16 for client ID, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 30/45] contrib: add ivshmem client and server, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 33/45] ivshmem-server: fix hugetlbfs support, Marc-André Lureau, 2015/07/27