aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorCao jin <caoj.fnst@cn.fujitsu.com>2016-11-02 21:44:46 +0800
committerMichael Tokarev <mjt@tls.msk.ru>2017-01-24 23:26:53 +0300
commit4a3ecf201a1a49a804e8506df5906e446707c3b1 (patch)
tree834cc87622ce0b09b0b92898d5eb4e02105a5424 /util
parent8907379204807b8047e710ae76c4d6849c3f6ce1 (diff)
downloadqemu-4a3ecf201a1a49a804e8506df5906e446707c3b1.zip
qemu-4a3ecf201a1a49a804e8506df5906e446707c3b1.tar.gz
qemu-4a3ecf201a1a49a804e8506df5906e446707c3b1.tar.bz2
util/mmap-alloc: check parameter before using
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'util')
-rw-r--r--util/mmap-alloc.c7
1 files 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) |