Commit 4a3ecf20 authored by Cao jin's avatar Cao jin Committed by Michael Tokarev
Browse files

util/mmap-alloc: check parameter before using 



Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 89073792

util/mmap-alloc.c

+4 −3
Original line number Diff line number Diff line
@@ -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) |