diff options
| author | Max Rees <maxcrees@me.com> | 2020-03-24 17:26:38 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-03-24 17:26:38 -0500 |
| commit | ffd6e687a5d0029a192bf16b220ccbfbb21bdd81 (patch) | |
| tree | 32bdcf4f8e9d2cf14c865ac27df6ab028e420871 /user/qemu/MAP_SYNC-fix.patch | |
| parent | 20f2af5a8c48426fd0ee30b6865942256a072274 (diff) | |
| download | packages-ffd6e687a5d0029a192bf16b220ccbfbb21bdd81.tar.gz packages-ffd6e687a5d0029a192bf16b220ccbfbb21bdd81.tar.bz2 packages-ffd6e687a5d0029a192bf16b220ccbfbb21bdd81.tar.xz packages-ffd6e687a5d0029a192bf16b220ccbfbb21bdd81.zip | |
user/qemu: [CVE] bump to 4.2.0 (#121)
* SSH block device support is dropped until we ship libssh (upstream
switched away from libssh2)
* system-ppcemb target dropped upstream
* Switched to user/libslirp (4.2.0) instead of vendored copy (4.1.0)
which fixes several CVEs (included in these secfixes for this time
only; future secfixes for libslirp should be in user/libslirp with a
rebuild of qemu for the statically linked bits).
Diffstat (limited to 'user/qemu/MAP_SYNC-fix.patch')
| -rw-r--r-- | user/qemu/MAP_SYNC-fix.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/user/qemu/MAP_SYNC-fix.patch b/user/qemu/MAP_SYNC-fix.patch new file mode 100644 index 000000000..e13609d73 --- /dev/null +++ b/user/qemu/MAP_SYNC-fix.patch @@ -0,0 +1,22 @@ +diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c +index f7f177d..7598960 100644 +--- a/util/mmap-alloc.c ++++ b/util/mmap-alloc.c +@@ -10,14 +10,16 @@ + * later. See the COPYING file in the top-level directory. + */ + ++#include "qemu/osdep.h" ++ + #ifdef CONFIG_LINUX + #include <linux/mman.h> ++#include <asm-generic/mman.h> /* for ppc64le */ + #else /* !CONFIG_LINUX */ + #define MAP_SYNC 0x0 + #define MAP_SHARED_VALIDATE 0x0 + #endif /* CONFIG_LINUX */ + +-#include "qemu/osdep.h" + #include "qemu/mmap-alloc.h" + #include "qemu/host-utils.h" + |