diff --git a/fs/vfs/vnode.c b/fs/vfs/vnode.c index 28213d16b08b84fdaacd17900bf67f03b0ef4b23..9dd3a095030dacb85f6a0d1915a839b807e6fcfa 100644 --- a/fs/vfs/vnode.c +++ b/fs/vfs/vnode.c @@ -404,6 +404,8 @@ int VnodeLookupAt(const char *path, struct Vnode **result, uint32_t flags, struc *result = currentVnode; if (currentVnode->filePath == NULL) { currentVnode->filePath = normalizedPath; + } else { + free(normalizedPath); } return ret; } else if (VfsVnodePermissionCheck(currentVnode, EXEC_OP)) { diff --git a/kernel/extended/dynload/src/los_load_elf.c b/kernel/extended/dynload/src/los_load_elf.c index 03d83865f7b48d418ea96e969f5a8a4d7f50a9d6..b565a21be533d890e9bd320859866fb8fcf09c61 100644 --- a/kernel/extended/dynload/src/los_load_elf.c +++ b/kernel/extended/dynload/src/los_load_elf.c @@ -76,6 +76,10 @@ static int OsELFClose(int procFd) int ret; /* Process procfd convert to system global procfd */ int sysfd = DisassociateProcessFd(procFd); + if (sysfd < 0) { + return -EBADF; + } + ret = close(sysfd); if (ret < 0) { AssociateSystemFd(procFd, sysfd); @@ -120,6 +124,10 @@ STATIC INT32 OsReadELFInfo(INT32 procfd, UINT8 *buffer, size_t readSize, off_t o ssize_t byteNum; off_t returnPos; INT32 fd = GetAssociatedSystemFd(procfd); + if (fd < 0) { + PRINT_ERR("%s[%d], Invalid procfd!\n", __FUNCTION__, __LINE__); + return LOS_NOK; + } if (readSize > 0) { returnPos = lseek(fd, offset, SEEK_SET); @@ -218,6 +226,8 @@ STATIC INT32 OsReadEhdr(const CHAR *fileName, ELFInfo *elfInfo, BOOL isExecFile) ret = fs_getfilep(GetAssociatedSystemFd(elfInfo->procfd), &OsCurrProcessGet()->execFile); if (ret) { PRINT_ERR("%s[%d], Failed to get struct file %s!\n", __FUNCTION__, __LINE__, fileName); + /* File will be closed by OsLoadELFFile */ + return ret; } } #endif