github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-29 16:58:10 +00:00
Code Issues Projects Releases Wiki Activity

DM: using 'strncpy' coding style cleanup

Browse Source 
- check buffer boundaries to avoid buffer overflow

Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Yonghua Huang 2018-05-24 18:21:41 +08:00 committed by lijinxia
parent 2f3953a99a
commit 71975d63fd
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devicemodel/core/hugetlb.c
View File

@ -108,6 +108,7 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
char uuid_str[48]; char uuid_str[48];
uint8_t UUID[16]; uint8_t UUID[16];
char *path; char *path;
size_t len;
struct statfs fs; struct statfs fs;
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
@ -116,10 +117,12 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
} }
path = hugetlb_priv[level].node_path; path = hugetlb_priv[level].node_path;
memset(path, '\0', MAX_PATH_LEN);
strncpy(path, hugetlb_priv[level].mount_path, MAX_PATH_LEN); strncpy(path, hugetlb_priv[level].mount_path, MAX_PATH_LEN);
len = strnlen(path, MAX_PATH_LEN);
/* UUID will use 32 bytes */ /* UUID will use 32 bytes */
if (strnlen(path, MAX_PATH_LEN) + 32 > MAX_PATH_LEN) { if (len + 32 > MAX_PATH_LEN) {
perror("PATH overflow"); perror("PATH overflow");
return -ENOMEM; return -ENOMEM;
} }
@ -132,6 +135,7 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
UUID[8], UUID[9], UUID[10], UUID[11], UUID[8], UUID[9], UUID[10], UUID[11],
UUID[12], UUID[13], UUID[14], UUID[15]); UUID[12], UUID[13], UUID[14], UUID[15]);
*(path + len) = '\0';
strncat(path, uuid_str, strlen(uuid_str)); strncat(path, uuid_str, strlen(uuid_str));
printf("open hugetlbfs file %s\n", path); printf("open hugetlbfs file %s\n", path);
@ -284,7 +288,8 @@ static int mmap_hugetlbfs_highmem(struct vmctx *ctx)
static int create_hugetlb_dirs(int level) static int create_hugetlb_dirs(int level)
{ {
char tmp_path[MAX_PATH_LEN], *path; char tmp_path[MAX_PATH_LEN], *path;
int i, len; int i;
size_t len;
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); perror("exceed max hugetlb level");
@ -293,8 +298,8 @@ static int create_hugetlb_dirs(int level)
path = hugetlb_priv[level].mount_path; path = hugetlb_priv[level].mount_path;
len = strlen(path); len = strlen(path);
if (len >= MAX_PATH_LEN) { if (len >= MAX_PATH_LEN || len == 0) {
perror("exceed max path len"); perror("invalid path len");
return -EINVAL; return -EINVAL;
} }

6
devicemodel/core/sw_load_bzimage.c
View File

@ -131,8 +131,7 @@ acrn_parse_kernel(char *arg)
size_t len = strlen(arg); size_t len = strlen(arg);
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(kernel_path, arg, len); strncpy(kernel_path, arg, len + 1);
kernel_path[len] = '\0';
if (check_image(kernel_path) != 0){ if (check_image(kernel_path) != 0){
fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n", fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n",
kernel_path); kernel_path);
@ -151,8 +150,7 @@ acrn_parse_ramdisk(char *arg)
size_t len = strlen(arg); size_t len = strlen(arg);
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(ramdisk_path, arg, len); strncpy(ramdisk_path, arg, len + 1);
ramdisk_path[len] = '\0';
if (check_image(ramdisk_path) != 0){ if (check_image(ramdisk_path) != 0){
fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n", fprintf(stderr, "SW_LOAD: check_image failed for '%s'\n",
ramdisk_path); ramdisk_path);

3
devicemodel/core/sw_load_common.c
View File

@ -104,8 +104,7 @@ acrn_parse_bootargs(char *arg)
size_t len = strlen(arg); size_t len = strlen(arg);
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(bootargs, arg, len); strncpy(bootargs, arg, len + 1);
bootargs[len] = '\0';
with_bootargs = 1; with_bootargs = 1;
printf("SW_LOAD: get bootargs %s\n", bootargs); printf("SW_LOAD: get bootargs %s\n", bootargs);
return 0; return 0;

6
devicemodel/core/sw_load_vsbl.c
View File

@ -111,8 +111,7 @@ acrn_parse_guest_part_info(char *arg)
size_t len = strlen(arg); size_t len = strlen(arg);
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(guest_part_info_path, arg, len); strncpy(guest_part_info_path, arg, len + 1);
guest_part_info_path[len] = '\0';
assert(check_image(guest_part_info_path) == 0); assert(check_image(guest_part_info_path) == 0);
with_guest_part_info = true; with_guest_part_info = true;
@ -172,8 +171,7 @@ acrn_parse_vsbl(char *arg)
size_t len = strlen(arg); size_t len = strlen(arg);
if (len < STR_LEN) { if (len < STR_LEN) {
strncpy(vsbl_path, arg, len); strncpy(vsbl_path, arg, len + 1);
vsbl_path[len] = '\0';
assert(check_image(vsbl_path) == 0); assert(check_image(vsbl_path) == 0);
vsbl_file_name = vsbl_path; vsbl_file_name = vsbl_path;

4
devicemodel/hw/platform/acpi/acpi.c
View File

@ -922,7 +922,7 @@ basl_make_templates(void)
len = strlen(tmpdir); len = strlen(tmpdir);
if ((len + sizeof(ASL_TEMPLATE) + 1) < MAXPATHLEN) { if ((len + sizeof(ASL_TEMPLATE) + 1) < MAXPATHLEN) {
strncpy(basl_template, tmpdir, len); strncpy(basl_template, tmpdir, len + 1);
while (len > 0 && basl_template[len - 1] == '/') while (len > 0 && basl_template[len - 1] == '/')
len--; len--;
basl_template[len] = '/'; basl_template[len] = '/';
@ -937,7 +937,7 @@ basl_make_templates(void)
*/ */
if ((len + sizeof(ASL_TEMPLATE) + 1 + if ((len + sizeof(ASL_TEMPLATE) + 1 +
sizeof(ASL_SUFFIX)) < MAXPATHLEN) { sizeof(ASL_SUFFIX)) < MAXPATHLEN) {
strncpy(basl_stemplate, tmpdir, len); strncpy(basl_stemplate, tmpdir, len + 1);
basl_stemplate[len] = '/'; basl_stemplate[len] = '/';
strncpy(&basl_stemplate[len + 1], ASL_TEMPLATE, strncpy(&basl_stemplate[len + 1], ASL_TEMPLATE,
MAXPATHLEN - len - 1); MAXPATHLEN - len - 1);