[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/31] util/mmap-alloc: check parameter before using
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 22/31] util/mmap-alloc: check parameter before using |
Date: |
Tue, 24 Jan 2017 12:39:26 +0300 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
util/mmap-alloc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 5a85aa3..d713a72 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/mmap-alloc.h"
+#include "qemu/host-utils.h"
#define HUGETLBFS_MAGIC 0x958458f6
@@ -61,18 +62,18 @@ void *qemu_ram_mmap(int fd, size_t size, size_t align, bool
shared)
#else
void *ptr = mmap(0, total, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
#endif
- size_t offset = QEMU_ALIGN_UP((uintptr_t)ptr, align) - (uintptr_t)ptr;
+ size_t offset;
void *ptr1;
if (ptr == MAP_FAILED) {
return MAP_FAILED;
}
- /* Make sure align is a power of 2 */
- assert(!(align & (align - 1)));
+ assert(is_power_of_2(align));
/* Always align to host page size */
assert(align >= getpagesize());
+ offset = QEMU_ALIGN_UP((uintptr_t)ptr, align) - (uintptr_t)ptr;
ptr1 = mmap(ptr + offset, size, PROT_READ | PROT_WRITE,
MAP_FIXED |
(fd == -1 ? MAP_ANONYMOUS : 0) |
--
2.1.4
- [Qemu-devel] [PULL 11/31] pcie: fix typo in comments, (continued)
- [Qemu-devel] [PULL 11/31] pcie: fix typo in comments, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 09/31] object.h: spelling fix, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 17/31] hw/i386/kvmvapic: Remove dead code in patch_hypercalls(), Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 13/31] pci-assign: avoid pointless stat, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 06/31] hw: Fix typos found by codespell, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 02/31] hw/block/m25p80: Fix typo in local macro name, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 31/31] hw/isa/isa-bus: Set category of the "isabus-bridge" device, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 28/31] gdbstub.c: fix GDB connection segfault caused by empty machines, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 16/31] doc/usb2: fix typo, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 25/31] hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 22/31] util/mmap-alloc: check parameter before using,
Michael Tokarev <=
- [Qemu-devel] [PULL 30/31] usb: Set category and description of the MTP device, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 19/31] disas/cris.c: Fix Coverity warning about unchecked NULL, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 03/31] README: Add linux to macOS build info, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 07/31] qemu-options: cleanup duplicated help message for kernel_irqchip, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 05/31] include: Fix typos found by codespell, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 29/31] gdbstub.c: update old error report statements, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 21/31] vfio: remove a duplicated word in comments, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 27/31] scsi-disk: add 'fall through' comment to switch VERIFY cases, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 18/31] lm32: milkymist-tmu2: fix another integer overflow, Michael Tokarev, 2017/01/24
- [Qemu-devel] [PULL 23/31] util/mmap-alloc: refactor a little bit for readability, Michael Tokarev, 2017/01/24