yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!657 fix：告警修复 

Merge pull request !657 from Zhaotianyu/0323codex_fix_1
This commit is contained in:
openharmony_ci 2022-03-23 09:37:33 +00:00 committed by Gitee
parent 45654cee93 d84471ff29
commit fe7191183e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/fs/vfs/vfs_fs.c
View File

@ -910,12 +910,17 @@ int LOS_Open(const char *path, int flags, ...)
{ {
#ifdef LOSCFG_RANDOM_DEV #ifdef LOSCFG_RANDOM_DEV
unsigned flagMask = O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_LARGEFILE | O_TRUNC | O_EXCL | O_DIRECTORY; unsigned flagMask = O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_LARGEFILE | O_TRUNC | O_EXCL | O_DIRECTORY;
if (((unsigned)flags & ~flagMask) || (path == NULL)) { if ((unsigned)flags & ~flagMask) {
errno = EINVAL; errno = EINVAL;
return LOS_NOK; return LOS_NOK;
} }
size_t pathLen = strlen(path) + 1; size_t pathLen = strlen(path) + 1;
if ((unsigned)pathLen > PATH_MAX) {
errno = EINVAL;
return LOS_NOK;
}
char *canonicalPath = (char *)malloc(pathLen); char *canonicalPath = (char *)malloc(pathLen);
if (!canonicalPath) { if (!canonicalPath) {
errno = ENOMEM; errno = ENOMEM;
@ -952,7 +957,7 @@ int LOS_Open(const char *path, int flags, ...)
FREE_AND_SET_NULL(canonicalPath); FREE_AND_SET_NULL(canonicalPath);
#endif #endif
#if (LOSCFG_POSIX_PIPE_API == 1) #if (LOSCFG_POSIX_PIPE_API == 1)
if (!strncmp(path, PIPE_DEV_PATH, strlen(PIPE_DEV_PATH))) { if ((path != NULL) && !strncmp(path, PIPE_DEV_PATH, strlen(PIPE_DEV_PATH))) {
return PipeOpen(path, flags, PIPE_DEV_FD); return PipeOpen(path, flags, PIPE_DEV_FD);
} }
#endif #endif

1
kernel/src/los_queue.c
View File

@ -39,6 +39,7 @@
#include "los_memory.h" #include "los_memory.h"
#include "los_task.h" #include "los_task.h"
#include "los_sched.h" #include "los_sched.h"
#include <stdint.h>
#if (LOSCFG_BASE_IPC_QUEUE == 1) #if (LOSCFG_BASE_IPC_QUEUE == 1)