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

!809 3.0 LTS 告警清零 

Merge pull request !809 from yinjiaming/OpenHarmony-3.0-LTS
This commit is contained in:
openharmony_ci 2022-03-02 03:14:43 +00:00 committed by Gitee
parent 89154a3765 84011c89a5
commit 9c1e902b55
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 5 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

@ -134,7 +134,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;

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

@ -1216,12 +1216,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 (int)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 (int)ret;
} }

2
platform/los_hilog.c
View File

@ -148,7 +148,7 @@ static int HiLogBufferCopy(unsigned char *dst, unsigned dstLen, unsigned char *s
static int HiLogReadRingBuffer(unsigned char *buffer, size_t bufLen) static int HiLogReadRingBuffer(unsigned char *buffer, size_t bufLen)
{ {
size_t retval; int retval;
size_t bufLeft = HILOG_BUFFER - g_hiLogDev.headOffset; size_t bufLeft = HILOG_BUFFER - g_hiLogDev.headOffset;
if (bufLeft > bufLen) { if (bufLeft > bufLen) {
retval = HiLogBufferCopy(buffer, bufLen, HiLogBufferHead(), bufLen); retval = HiLogBufferCopy(buffer, bufLen, HiLogBufferHead(), bufLen);