github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-11 05:39:45 +00:00
Code Issues Projects Releases Wiki Activity

dm: cleanup 'assert' for guest software loading module

Browse Source 
cleanup 'assert' to avoid possible 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:10:14 +08:00
committed by wenlingz
parent 0e046c7a0a
commit ec626482d2
4 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
devicemodel/core/sw_load_vsbl.c
View File

@@ -28,7 +28,6 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <stdbool.h>
#include "dm.h"
@@ -125,21 +124,19 @@ vsbl_set_bdf(int bnum, int snum, int fnum)
int
acrn_parse_guest_part_info(char *arg)
{
int error;
int error = -1;
size_t len = strnlen(arg, STR_LEN);
if (len < STR_LEN) {
strncpy(guest_part_info_path, arg, len + 1);
error = check_image(guest_part_info_path, 0, &guest_part_info_size);
assert(!error);
with_guest_part_info = true;
printf("SW_LOAD: get partition blob path %s\n",
guest_part_info_path);
return 0;
} else
return -1;
if (check_image(guest_part_info_path, 0, &guest_part_info_size) == 0) {
with_guest_part_info = true;
printf("SW_LOAD: get partition blob path %s\n",
guest_part_info_path);
error = 0;
}
}
return error;
}
static int
@@ -194,21 +191,18 @@ acrn_prepare_guest_part_info(struct vmctx *ctx)
int
acrn_parse_vsbl(char *arg)
{
int error;
int error = -1;
size_t len = strnlen(arg, STR_LEN);
if (len < STR_LEN) {
strncpy(vsbl_path, arg, len + 1);
error = check_image(vsbl_path, 8 * MB, &vsbl_size);
assert(!error);
vsbl_file_name = vsbl_path;
printf("SW_LOAD: get vsbl path %s\n",
vsbl_path);
return 0;
} else
return -1;
if (check_image(vsbl_path, 8 * MB, &vsbl_size) == 0) {
vsbl_file_name = vsbl_path;
printf("SW_LOAD: get vsbl path %s\n", vsbl_path);
error = 0;
}
}
return error;
}
static int