未验证 提交 b797f505 编写于 作者: O openharmony_ci 提交者: Gitee

!813 主干告警清零

Merge pull request !813 from yinjiaming/master
...@@ -46,7 +46,7 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count) ...@@ -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) {
......
...@@ -133,7 +133,7 @@ int fallocate64(int fd, int mode, off64_t offset, off64_t len) ...@@ -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;
} }
......
...@@ -1306,15 +1306,15 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg ...@@ -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 ...@@ -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;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册