github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

dm: fix potential program crash issue in disk_logger

Browse Source 
detection of any error in 'probe_disk_log_file()'
  calling 'pr_err()' will cause 'write_to_disk()' function
  being called recursively infinitely, as pr_err will
  call write_to_disk() and trap to probe_disk_log_file() again,
  hence program will crash finally.

  This patch fix above issue by using printf instead of pr_err,
  as printf outputs to console directly.

Tracked-On: #6518
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Yonghua Huang 2021-08-30 09:44:06 +03:00 committed by wenlingz
parent 66608b38dd
commit b897fe3933
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devicemodel/log/disk_logger.c
View File

@ -65,7 +65,7 @@ static int probe_disk_log_file(void)
if (stat(LOG_PATH_NODE, &st)) { if (stat(LOG_PATH_NODE, &st)) {
if (system("mkdir -p " LOG_PATH_NODE) < 0) { if (system("mkdir -p " LOG_PATH_NODE) < 0) {
pr_err(DISK_PREFIX"create path: %s failed! Error: %s\n", printf(DISK_PREFIX"create path: %s failed! Error: %s\n",
LOG_PATH_NODE, strerror(errno)); LOG_PATH_NODE, strerror(errno));
return -1; return -1;
} }
@ -73,7 +73,7 @@ static int probe_disk_log_file(void)
dir = opendir(LOG_PATH_NODE); dir = opendir(LOG_PATH_NODE);
if (!dir) { if (!dir) {
pr_err(DISK_PREFIX" open %s failed! Error: %s\n", printf(DISK_PREFIX" open %s failed! Error: %s\n",
LOG_PATH_NODE, strerror(errno)); LOG_PATH_NODE, strerror(errno));
return -1; return -1;
} }
@ -100,12 +100,12 @@ static int probe_disk_log_file(void)
snprintf(file_name, FILE_NAME_LENGTH - 1, LOG_NAME_FMT, LOG_PATH_NODE, vmname, index); snprintf(file_name, FILE_NAME_LENGTH - 1, LOG_NAME_FMT, LOG_PATH_NODE, vmname, index);
disk_fd = open(file_name, O_RDWR | O_CREAT | O_APPEND, 0644); disk_fd = open(file_name, O_RDWR | O_CREAT | O_APPEND, 0644);
if (disk_fd < 0) { if (disk_fd < 0) {
pr_err(DISK_PREFIX" open %s failed! Error: %s\n", file_name, strerror(errno)); printf(DISK_PREFIX" open %s failed! Error: %s\n", file_name, strerror(errno));
return -1; return -1;
} }
if (write(disk_fd, LOG_DELIMITER, strlen(LOG_DELIMITER)) < 0) { if (write(disk_fd, LOG_DELIMITER, strlen(LOG_DELIMITER)) < 0) {
pr_err(DISK_PREFIX" write %s failed! Error: %s\n", file_name, strerror(errno)); printf(DISK_PREFIX" write %s failed! Error: %s\n", file_name, strerror(errno));
return -1; return -1;
} }
@ -182,7 +182,7 @@ static void write_to_disk(const char *fmt, va_list args)
write_cnt = write(disk_fd, buffer, strnlen(buffer, DISK_LOG_MAX_LEN)); write_cnt = write(disk_fd, buffer, strnlen(buffer, DISK_LOG_MAX_LEN));
if (write_cnt < 0) { if (write_cnt < 0) {
pr_err(DISK_PREFIX"write disk failed"); printf(DISK_PREFIX"write disk failed");
close(disk_fd); close(disk_fd);
disk_fd = -1; disk_fd = -1;
return; return;
@ -204,7 +204,7 @@ static void write_to_disk(const char *fmt, va_list args)
close(disk_fd); close(disk_fd);
disk_fd = open(file_name, O_RDWR | O_CREAT, 0644); disk_fd = open(file_name, O_RDWR | O_CREAT, 0644);
if (disk_fd < 0) { if (disk_fd < 0) {
pr_err(DISK_PREFIX" open %s failed! Error: %s\n", file_name, strerror(errno)); printf(DISK_PREFIX" open %s failed! Error: %s\n", file_name, strerror(errno));
return; return;
} }
cur_log_size = 0; cur_log_size = 0;