From 84011c89a59f8b9fe943625302876b14c8b14a68 Mon Sep 17 00:00:00 2001
From: yinjiaming <yinjiaming@huawei.com>
Date: Wed, 23 Feb 2022 11:02:55 +0000
Subject: [PATCH] =?UTF-8?q?fix:=203.0=20LTS=20=E5=91=8A=E8=AD=A6=E6=B8=85?=
 =?UTF-8?q?=E9=9B=B6=20=E3=80=90=E8=83=8C=E6=99=AF=E3=80=91=203.0=20LTS=20?=
 =?UTF-8?q?=E7=BB=8F=E8=BF=87=E6=89=AB=E6=8F=8F=E6=9C=89=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E9=9C=80=E8=A6=81=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【修改方案】
在需要的地方添加了强制类型转换

【影响】
对现有的产品编译不会有影响。

re #I4UZW3

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I1f9cd16293b649ea9f9b3c4d3d02b1bfe95114e2
---
 arch/arm/arm/src/strncpy_from_user.c | 2 +-
 fs/vfs/operation/vfs_fallocate64.c   | 2 +-
 kernel/extended/liteipc/hm_liteipc.c | 4 ++--
 platform/los_hilog.c                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/arm/src/strncpy_from_user.c b/arch/arm/arm/src/strncpy_from_user.c
index 70c98bc9..0e400ce3 100644
--- a/arch/arm/arm/src/strncpy_from_user.c
+++ b/arch/arm/arm/src/strncpy_from_user.c
@@ -46,7 +46,7 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 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) {
         if (LOS_GetUser(&character, src + offset) != LOS_OK) {
diff --git a/fs/vfs/operation/vfs_fallocate64.c b/fs/vfs/operation/vfs_fallocate64.c
index 0560feef..86430230 100644
--- a/fs/vfs/operation/vfs_fallocate64.c
+++ b/fs/vfs/operation/vfs_fallocate64.c
@@ -134,7 +134,7 @@ int fallocate64(int fd, int mode, off64_t offset, off64_t len)
         return VFS_ERROR;
       }
 
-    if (filep->f_oflags & O_DIRECTORY)
+    if ((unsigned int)filep->f_oflags & O_DIRECTORY)
       {
         set_errno(EBADF);
         return VFS_ERROR;
diff --git a/kernel/extended/liteipc/hm_liteipc.c b/kernel/extended/liteipc/hm_liteipc.c
index f23c6894..0e714f2c 100644
--- a/kernel/extended/liteipc/hm_liteipc.c
+++ b/kernel/extended/liteipc/hm_liteipc.c
@@ -1216,12 +1216,12 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
             }
             ret = LiteIpcMsgHandle((IpcContent *)(UINTPTR)arg);
             if (ret != LOS_OK) {
-                return ret;
+                return (int)ret;
             }
             break;
         default:
             PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd);
             return -EINVAL;
     }
-    return ret;
+    return (int)ret;
 }
diff --git a/platform/los_hilog.c b/platform/los_hilog.c
index b26e2793..4185aaab 100644
--- a/platform/los_hilog.c
+++ b/platform/los_hilog.c
@@ -148,7 +148,7 @@ static int HiLogBufferCopy(unsigned char *dst, unsigned dstLen, unsigned char *s
 
 static int HiLogReadRingBuffer(unsigned char *buffer, size_t bufLen)
 {
-    size_t retval;
+    int retval;
     size_t bufLeft = HILOG_BUFFER - g_hiLogDev.headOffset;
     if (bufLeft > bufLen) {
         retval = HiLogBufferCopy(buffer, bufLen, HiLogBufferHead(), bufLen);