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

!813 主干告警清零 

Merge pull request !813 from yinjiaming/master
This commit is contained in:
openharmony_ci 2022-03-09 03:51:33 +00:00 committed by Gitee
parent 913d22bf83 672bc729a6
commit b797f50596
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/arm/src/strncpy_from_user.c
View File

@ -46,7 +46,7 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count)
} }
maxCount = (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)src, (size_t)count)) ? \ maxCount = (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)src, (size_t)count)) ? \
count : (USER_ASPACE_TOP_MAX - (UINTPTR)src); count : (INT32)(USER_ASPACE_TOP_MAX - (UINTPTR)src);
for (i = 0; i < maxCount; ++i) { for (i = 0; i < maxCount; ++i) {
if (LOS_GetUser(&character, src + offset) != LOS_OK) { if (LOS_GetUser(&character, src + offset) != LOS_OK) {

2
fs/vfs/operation/vfs_fallocate64.c
View File

@ -133,7 +133,7 @@ int fallocate64(int fd, int mode, off64_t offset, off64_t len)
return VFS_ERROR; return VFS_ERROR;
} }
if (filep->f_oflags & O_DIRECTORY) { if ((unsigned int)filep->f_oflags & O_DIRECTORY) {
set_errno(EBADF); set_errno(EBADF);
return VFS_ERROR; return VFS_ERROR;
} }

10
kernel/extended/liteipc/hm_liteipc.c
View File

@ -1306,15 +1306,15 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
switch (cmd) { switch (cmd) {
case IPC_SET_CMS: case IPC_SET_CMS:
return SetCms(arg); return (INT32)SetCms(arg);
case IPC_CMS_CMD: case IPC_CMS_CMD:
return HandleCmsCmd((CmsCmdContent *)(UINTPTR)arg); return (INT32)HandleCmsCmd((CmsCmdContent *)(UINTPTR)arg);
case IPC_SET_IPC_THREAD: case IPC_SET_IPC_THREAD:
if (IsCmsSet() == FALSE) { if (IsCmsSet() == FALSE) {
PRINT_ERR("Liteipc ServiceManager not set!\n"); PRINT_ERR("Liteipc ServiceManager not set!\n");
return -EINVAL; return -EINVAL;
} }
return SetIpcTask(); return (INT32)SetIpcTask();
case IPC_SEND_RECV_MSG: case IPC_SEND_RECV_MSG:
if (arg == 0) { if (arg == 0) {
return -EINVAL; return -EINVAL;
@ -1325,12 +1325,12 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
} }
ret = LiteIpcMsgHandle((IpcContent *)(UINTPTR)arg); ret = LiteIpcMsgHandle((IpcContent *)(UINTPTR)arg);
if (ret != LOS_OK) { if (ret != LOS_OK) {
return ret; return (INT32)ret;
} }
break; break;
default: default:
PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd); PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd);
return -EINVAL; return -EINVAL;
} }
return ret; return (INT32)ret;
} }