github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-09 02:24:45 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: Fix potential issues for load_conf module of acrnprobe

Browse Source 
This patch is to fix potential issues, which are reported by static
analysis tool, for load_conf module of acrnprobe.

Changes:
1. Check the range of id while loading configuration, to avoid
   memory corruption.
2. Use strncpy instead of strcpy to avoid buf overflow.

Signed-off-by: Liu Xinwu <xinwu.liu@intel.com>
Reviewed-by: Zhi Jin <zhi.jin@intel.com>
Acked-by: Chen Gang <gang.c.chen@intel.com>
This commit is contained in:
xiaojin2
2018-06-08 13:11:17 +08:00
committed by lijinxia
parent b3ca8f43ff
commit 0c39b9cddc
3 changed files with 220 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/acrn-crashlog/acrnprobe/main.c
View File

@@ -35,15 +35,20 @@ void usage(void)
printf("\t-V, --version Print the program version\n");
}
static void uptime(struct sender_t *sender)
static void uptime(const struct sender_t *sender)
{
int fd;
int frequency;
struct uptime_t *uptime;
const struct uptime_t *uptime;
uptime = sender->uptime;
if (!uptime)
return;
frequency = atoi(uptime->frequency);
sleep(frequency);
if (frequency > 0)
sleep(frequency);
fd = open(uptime->path, O_RDWR | O_CREAT, 0666);
if (fd < 0)
LOGE("open uptime_file with (%d, %s) failed, error (%s)\n",
@@ -59,7 +64,7 @@ int main(int argc, char *argv[])
int id;
int op;
struct sender_t *sender;
char cfg[PATH_MAX] = {0};
char cfg[PATH_MAX];
char *config_path[2] = {CONFIG_CUSTOMIZE,
CONFIG_INSTALL};
struct option opts[] = {
@@ -73,7 +78,7 @@ int main(int argc, char *argv[])
NULL)) != -1) {
switch (op) {
case 'c':
strcpy(cfg, optarg);
strncpy(cfg, optarg, PATH_MAX);
break;
case 'h':
usage();
@@ -92,10 +97,11 @@ int main(int argc, char *argv[])
if (!cfg[0]) {
if (file_exists(config_path[0]))
strcpy(cfg, config_path[0]);
strncpy(cfg, config_path[0], PATH_MAX);
else
strcpy(cfg, config_path[1]);
strncpy(cfg, config_path[1], PATH_MAX);
}
cfg[PATH_MAX - 1] = 0;
ret = load_conf(cfg);
if (ret)