github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-06 19:30:46 +00:00
Code Issues Projects Releases Wiki Activity

dm: refine 'assert' in hugetlb.c and mem.c

Browse Source 
cleanup 'assert' usage to avoid possible software vulnerabilities.

Tracked-On: #3252
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Reviewed-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Yonghua Huang
2019-06-17 18:39:24 +08:00
committed by wenlingz
parent 65d7d83b1c
commit 885d503a60
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devicemodel/core/mem.c
View File

@@ -35,7 +35,6 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <pthread.h>
@@ -178,7 +177,8 @@ emulate_mem(struct vmctx *ctx, struct mmio_request *mmio_req)
pthread_rwlock_unlock(&mmio_rwlock);
assert(entry != NULL);
if (entry == NULL)
return -EINVAL;
if (mmio_req->direction == REQUEST_READ)
err = mem_read(ctx, 0, paddr, (uint64_t *)&mmio_req->value,
@@ -238,11 +238,11 @@ unregister_mem_int(struct mmio_rb_tree *rbt, struct mem_range *memp)
err = mmio_rb_lookup(rbt, memp->base, &entry);
if (err == 0) {
mr = &entry->mr_param;
if (strncmp(mr->name, memp->name, MEMNAMESZ)) {
if (strncmp(mr->name, memp->name, MEMNAMESZ)
|| (mr->base != memp->base) || (mr->size != memp->size)
|| ((mr->flags & MEM_F_IMMUTABLE) != 0)) {
err = -1;
} else {
assert(mr->base == memp->base && mr->size == memp->size);
assert((mr->flags & MEM_F_IMMUTABLE) == 0);
RB_REMOVE(mmio_rb_tree, rbt, entry);
/* flush Per-VM cache */