!1081 fix: 【挑单】codecheck问题清零

Merge pull request !1081 from zhushengle/cherry-pick-1669685670
fixed 8d980de from https://gitee.com/zhushengle/kernel_liteos_a/pulls/1078
2022-11-29 03:20:11 +00:00 · 2022-11-29 01:34:30 +00:00 · 2022-11-14 03:24:57 +00:00 · 2022-11-11 09:16:52 +00:00 · 2022-10-27 14:24:41 +00:00 · 2022-10-26 08:53:15 +00:00
515 changed files with 2878 additions and 2587 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -323,7 +323,7 @@ group("liteos_a") {
    deps += [
      ":apps",
      ":tests",
-      "//prebuilts/lite/sysroot/build:strip",
+      "//third_party/musl/scripts/build_lite:strip",
    ]
    if (liteos_skip_make == false) {
      deps += [ ":make" ]
--- a/2
+++ b/2
@@ -265,7 +265,7 @@ config MEM_LEAKCHECK
    default n
    depends on DEBUG_VERSION && MEM_DEBUG
    help
-      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the informations of mem node.
+      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the information of mem node.
 config BASE_MEM_NODE_INTEGRITY_CHECK
    bool "Enable integrity check or not"
    default n
--- a/2
+++ b/2
@@ -121,7 +121,7 @@ sysroot:
 	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
 ifeq ($(origin SYSROOT_PATH),file)
 	$(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \
-	ln -snf $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/build/Makefile && \
+	ln -snf $(LITEOSTOPDIR)/../../third_party/musl/scripts/build_lite/Makefile && \
 	$(MAKE) TARGETS=liteos_a_user \
 		ARCH=$(ARCH) \
 		TARGET=$(LOSCFG_LLVM_TARGET) \
--- a/OAT.xml
+++ b/OAT.xml
@@ -23,6 +23,7 @@
        <licensefile></licensefile>
        <policylist>
            <policy name="projectPolicy" desc="">
+                <policyitem type="copyright" name="Huawei Technologies Co., Ltd. All rights reserved." path=".*" desc="original liteos copyright"/>
                <policyitem type="copyright" name="Huawei Device Co., Ltd. All rights reserved." path=".*" desc="original liteos copyright"/>
                <policyitem type="license" name="BSD-3-Clause" path=".*" desc="Liteos kernel use bsd3 license"/>
            </policy>
--- a/README_zh.md
+++ b/README_zh.md
@@ -33,6 +33,7 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 │       ├── quickstart     # 系统快速启动接口目录
 │       ├── random         # 随机数设备驱动
 │       └── video          # framebuffer驱动框架
+├── figures                # 内核架构图
 ├── fs                     # 文件系统模块，主要来源于NuttX开源项目
 │   ├── fat                # fat文件系统
 │   ├── jffs2              # jffs2文件系统
@@ -54,7 +55,9 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 │   ├── include            # 对外暴露头文件存放目录
 │   └── uart               # 串口相关逻辑代码
 ├── security               # 安全特性相关的代码，包括进程权限管理和虚拟id映射管理
+├── shell                  # 接收用户输入的命令，内核去执行
 ├── syscall                # 系统调用
+├── testsuilts             # 测试套件
 └── tools                  # 构建工具及相关配置和代码
 ```

--- a/apps/lms/src/sample_usr_lms.c
+++ b/apps/lms/src/sample_usr_lms.c
@@ -180,7 +180,8 @@ static void LmsStrcpyTest(void)
        return;
    }
    char *testStr = "bbbbbbbbbbbbbbbbb";
-    printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n", strlen(testStr) + 1);
+    printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n",
+           (int)strlen(testStr) + 1);
    strcpy(buf, testStr);
    free(buf);
    printf("\n-------- LmsStrcpyTest End --------\n");
--- a/apps/mksh/BUILD.gn
+++ b/apps/mksh/BUILD.gn
@@ -42,7 +42,7 @@ copy("copy_mksh_src") {

 build_ext_component("build_mksh") {
  deps = [ ":copy_mksh_src" ]
-  deps += [ "//prebuilts/lite/sysroot" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
  exec_path = rebase_path("$target_out_dir/mksh_build")

  cflags = [
--- a/apps/perf/src/main.c
+++ b/apps/perf/src/main.c
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
        PerfStop(fd);
    } else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) {
        size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0);
-        if (size <= 0) {
+        if (size == 0) {
            goto EXIT:
        }

--- a/apps/shell/src/main.c
+++ b/apps/shell/src/main.c
@@ -49,7 +49,7 @@ ShellCB *OsGetShellCb()
    return g_shellCB;
 }

-void ShellDeinit(ShellCB *shellCB)
+static void ShellDeinit(ShellCB *shellCB)
 {
    (void)pthread_mutex_destroy(&shellCB->historyMutex);
    (void)pthread_mutex_destroy(&shellCB->keyMutex);
@@ -65,27 +65,23 @@ static int OsShellCreateTask(ShellCB *shellCB)

    ret = sched_getparam(getpid(), &param);
    if (ret != SH_OK) {
-        goto OUT;
+        return ret;
    }

    param.sched_priority = SHELL_PROCESS_PRIORITY_INIT;

    ret = sched_setparam(getpid(), &param);
    if (ret != SH_OK) {
-        goto OUT;
+        return ret;
    }

    ret = ShellTaskInit(shellCB);
    if (ret != SH_OK) {
-        goto OUT;
+        return ret;
    }

    shellCB->shellEntryHandle = pthread_self();
    return 0;
-
-OUT:
-    ShellDeinit(shellCB);
-    return ret;
 }

 static int DoShellExec(char **argv)
@@ -148,7 +144,7 @@ int main(int argc, char **argv)

    shellCB = (ShellCB *)malloc(sizeof(ShellCB));
    if (shellCB == NULL) {
-        goto ERR_OUT1;
+        return SH_NOK;
    }
    ret = memset_s(shellCB, sizeof(ShellCB), 0, sizeof(ShellCB));
    if (ret != SH_OK) {
@@ -176,7 +172,9 @@ int main(int argc, char **argv)
    g_shellCB = shellCB;
    ret = OsShellCreateTask(shellCB);
    if (ret != SH_OK) {
-        goto ERR_OUT3;
+        ShellDeinit(shellCB);
+        g_shellCB = NULL;
+        return ret;
    }

    ShellEntry(shellCB);
--- a/apps/shell/src/shmsg.c
+++ b/apps/shell/src/shmsg.c
@@ -422,7 +422,7 @@ static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len

        forkPid = fork();
        if (forkPid < 0) {
-            printf("Faild to fork from shell\n");
+            printf("Failed to fork from shell\n");
            return;
        } else if (forkPid == 0) {
            ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray, foreground);
--- a/apps/tftp/src/tftpc.c
+++ b/apps/tftp/src/tftpc.c
@@ -500,7 +500,7 @@ static void lwip_tftp_send_error(s32_t iSockNum, u32_t ulError, const char *szEr
    }
 }

-/* INTEFACE to get a file using filename
+/* INTERFACE to get a file using filename
    ulHostAddr - IP address of Host
    szSrcFileName - Source file
    szDestDirPath - Destination file path
@@ -1419,7 +1419,7 @@ err_handler:
 }

 #ifdef TFTP_TO_RAWMEM
-/* INTEFACE to get a file using filename
+/* INTERFACE to get a file using filename
    ulHostAddr - IP address of Host
    szSrcFileName - Source file
    szDestMemAddr - The target memory address in the client
@@ -1437,10 +1437,8 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,
 {
    s32_t iSockNum = TFTP_NULL_INT32;
    u32_t ulSrcStrLen;
-    u32_t lDestStrLen;
    u32_t ulSize;
    u32_t ulRecvSize = TFTP_NULL_UINT32;
-    s32_t iErrCode;
    u32_t ulErrCode;
    u16_t usReadReq;
    u16_t usTempServPort;
--- a/apps/toybox/BUILD.gn
+++ b/apps/toybox/BUILD.gn
@@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
    ":copy_toybox_config",
    ":copy_toybox_src",
  ]
-  deps += [ "//prebuilts/lite/sysroot" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
  exec_path = rebase_path("$target_out_dir/toybox_build")

  cflags = [
--- a/apps/trace/src/trace.c
+++ b/apps/trace/src/trace.c
@@ -70,7 +70,7 @@ static void TraceRead(int fd, size_t size)
 {
    ssize_t i;
    ssize_t len;
-    if (size <= 0) {
+    if (size == 0) {
        return;
    }

--- a/arch/arm/arm/src/startup/reset_vector_mp.S
+++ b/arch/arm/arm/src/startup/reset_vector_mp.S
@@ -276,11 +276,11 @@ mmu_setup:
    mov     r12, #0x7                           /* 0b0111 */
    mcr     p15, 0, r12, c3, c0, 0              /* Set DACR with 0b0111, client and manager domian */
    isb
-    mrc    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxlliary Control Register */
+    mrc    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxiliary Control Register */
    orr    r12, r12, #(1 << 6)                  /* SMP, Enables coherent requests to the processor. */
    orr    r12, r12, #(1 << 2)                  /* Enable D-side prefetch */
    orr    r12, r12, #(1 << 11)                 /* Global BP Enable bit */
-    mcr    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxlliary Control Register */
+    mcr    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxiliary Control Register */
    dsb
    mrc     p15, 0, r12, c1, c0, 0
    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
--- a/bsd/dev/usb/Makefile
+++ b/bsd/dev/usb/Makefile
@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 include $(LITEOSTOPDIR)/config.mk
-include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
+include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk

 MODULE_NAME := usb_base

@@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c
 endif

 ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y)
-LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/framework/model/input/driver \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/include/core \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/core/common/include/host \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/utils \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/osal \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/ability/sbuf/include \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/include/osal \
+LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/model/input/driver \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/core \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/core/common/include/host \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/utils \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/osal \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/ability/sbuf/include \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/osal \
               -I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev

 LOCAL_SRCS += $(INPUT_SRC)/uhid.c  \
--- a/compat/posix/src/time.c
+++ b/compat/posix/src/time.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -71,7 +71,7 @@

 #ifdef LOSCFG_AARCH64
 /*
- * This two structures originally did't exit,
+ * This two structures originally didn't exit,
 * they added by liteos to support 64bit interfaces on 32bit platform,
 * in 64bit platform, timeval64 define to timeval which is platform adaptive.
 */
@@ -478,7 +478,6 @@ static int PthreadGetCputime(clockid_t clockID, struct timespec *ats)
    uint64_t runtime;
    UINT32 intSave;
    UINT32 tid = GetTidFromClockID(clockID);
-
    if (OS_TID_CHECK_INVALID(tid)) {
        return -EINVAL;
    }
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -5,7 +5,7 @@ config DRIVERS
      Answer Y to enable LiteOS support driver.

 source "bsd/dev/usb/Kconfig"
-source "../../drivers/adapter/khdf/liteos/Kconfig"
+source "../../drivers/hdf_core/adapter/khdf/liteos/Kconfig"

 # Device driver Kconfig import
 source "$(DEVICE_PATH)/drivers/Kconfig"
@@ -17,5 +17,4 @@ source "drivers/char/video/Kconfig"
 source "drivers/char/trace/Kconfig"
 source "drivers/char/perf/Kconfig"

-source "../../drivers/liteos/tzdriver/Kconfig"
 source "../../drivers/liteos/hievent/Kconfig"
--- a/drivers/block/disk/include/disk_pri.h
+++ b/drivers/block/disk/include/disk_pri.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -42,7 +42,7 @@

 #ifdef __cplusplus
 #if __cplusplus
-extern "C"{
+extern "C" {
 #endif
 #endif /* __cplusplus */

--- a/drivers/block/disk/src/disk.c
+++ b/drivers/block/disk/src/disk.c
@@ -1465,7 +1465,7 @@ INT32 los_disk_init(const CHAR *diskName, const struct block_operations *bops,
    ret = VnodeLookup(diskName, &blkDriver, 0);
    if (ret < 0) {
        VnodeDrop();
-        ret = ENOENT;
+        PRINT_ERR("disk_init : %s, failed to find the vnode, ERRNO=%d\n", diskName, ret);
        goto DISK_FIND_ERROR;
    }
    struct block_operations *bops2 = (struct block_operations *)((struct drv_data *)blkDriver->data)->ops;
--- a/fs/fat/os_adapt/fatfs.c
+++ b/fs/fat/os_adapt/fatfs.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -343,7 +343,8 @@ static FRESULT init_cluster(DIR_FILE *pdfp, DIR *dp_new, FATFS *fs, int type, co
    return FR_OK;
 }

-static int fatfs_create_obj(struct Vnode *parent, const char *name, int mode, struct Vnode **vpp, BYTE type, const char *target)
+static int fatfs_create_obj(struct Vnode *parent, const char *name, int mode, struct Vnode **vpp,
+                            BYTE type,  const char *target)
 {
    struct Vnode *vp = NULL;
    FATFS *fs = (FATFS *)parent->originMount->data;
@@ -1408,7 +1409,7 @@ DWORD fattime_format(time_t time)
    ftime |= ((DWORD)((st.tm_year > YEAR_OFFSET) ? (st.tm_year - YEAR_OFFSET) : 0)) << FTIME_YEAR_OFFSET;
    ftime <<= FTIME_DATE_OFFSET;

-    ftime = (DWORD)st.tm_sec / SEC_MULTIPLIER;
+    ftime |= (DWORD)st.tm_sec / SEC_MULTIPLIER;
    ftime |= ((DWORD)st.tm_min) << FTIME_MIN_OFFSET;
    ftime |= ((DWORD)st.tm_hour) << FTIME_HR_OFFSET;

@@ -2166,7 +2167,7 @@ int fatfs_symlink(struct Vnode *parentVnode, struct Vnode **newVnode, const char
 ssize_t fatfs_readlink(struct Vnode *vnode, char *buffer, size_t bufLen)
 {
    int ret;
-    FRESULT res = FR_OK;
+    FRESULT res;
    DWORD clust;
    QWORD sect;
    DIR_FILE *dfp = (DIR_FILE *)(vnode->data);
--- a/fs/fat/os_adapt/fatfs.h
+++ b/fs/fat/os_adapt/fatfs.h
@@ -64,7 +64,7 @@ extern "C" {
 #define MBR_PRIMARY_PART_NUM 4
 #define JUMP_CODE "\xEB\xFE\x90"

-/* Partiton type */
+/* Partition type */
 #define FAT12                  0x01 /* FAT12 as primary partition in first physical 32MB */
 #define FAT16                  0x04 /* FAT16 with less than 65536 sectors(32MB) */
 #define EXTENDED_PARTITION_CHS  0x05
--- a/fs/fat/virpart/src/virpart.c
+++ b/fs/fat/virpart/src/virpart.c
@@ -179,7 +179,7 @@ static INT FatfsDisablePart(void *handle)
 * Scan the FAT inside the boundary of CHILD FATFS limit, and update the free cluster and last cluster
 * for all CHILD FATFS.
 * Acceptable Return Value:
- * - FR_OK              : Successfully scaned the FAT and update field.
+ * - FR_OK              : Successfully scanned the FAT and update field.
 * Others Return Value:
 * - FR_INVAILD_FATFS   : The FATFS object has error or the info in it has been occuried
 * - FR_DENIED          : The virtual partition feature has been shut down by switcher
--- a/fs/fat/virpart/src/virpartff.c
+++ b/fs/fat/virpart/src/virpartff.c
@@ -373,7 +373,7 @@ static FRESULT FatfsCheckScanFatParam(FATFS *fs)
 * Scan the FAT inside the boundary of CHILD FATFS limit, and update the free cluster and last cluster
 *
 * Acceptable Return Value:
-* - FR_OK : Successfully scaned the FAT and update field.
+* - FR_OK : Successfully scanned the FAT and update field.
 *
 * Others Return Value:
 * - FR_INVAILD_FATFS   :   The FATFS object has error or the info in it has been occuried
--- a/fs/include/fs/fs_operation.h
+++ b/fs/include/fs/fs_operation.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -244,8 +244,9 @@ extern int chattr(const char *pathname, struct IATTR *attr);
 *
 * @retval #0  On success.
 * @retval #-1 On failure with errno set.
- * @retval CONTINE_NUTTX_FCNTL doesn't support some cmds in VfsFcntl, needs to continue going through Nuttx vfs operation.</li>
- *
+ * @retval CONTINE_NUTTX_FCNTL doesn't support some cmds in VfsFcntl, needs to continue going through 
+ * Nuttx vfs operation.</li>
+ *     
 * @par Dependency:
 * <ul><li>fs.h</li></ul>
 * @see None
--- a/fs/include/fs/mount.h
+++ b/fs/include/fs/mount.h
@@ -49,7 +49,7 @@ struct Mount {
    LIST_HEAD vnodeList;               /* list of vnodes */
    int vnodeSize;                     /* size of vnode list */
    LIST_HEAD activeVnodeList;         /* list of active vnodes */
-    int activeVnodeSize;               /* szie of active vnodes list */
+    int activeVnodeSize;               /* size of active vnodes list */
    void *data;                        /* private data */
    uint32_t hashseed;                 /* Random seed for vfshash */
    unsigned long mountFlags;          /* Flags for mount */
--- a/fs/jffs2/jffs2.patch
+++ b/fs/jffs2/jffs2.patch
@@ -2311,7 +2311,7 @@ diff -Nupr old/fs/jffs2/erase.c new/fs/jffs2/erase.c
 diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 --- old/fs/jffs2/file.c	2022-05-09 17:22:53.000000000 +0800
 +++ new/fs/jffs2/file.c	2022-05-10 09:43:14.250000000 +0800
-@@ -9,325 +9,34 @@
+@@ -9,335 +9,30 @@
  * For licensing information, see the file 'LICENCE' in this directory.
  *
  */
@@ -2336,32 +2336,35 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			loff_t pos, unsigned len, unsigned flags,
 -			struct page **pagep, void **fsdata);
 -static int jffs2_readpage (struct file *filp, struct page *pg);
-
-int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
-{
-	struct inode *inode = filp->f_mapping->host;
-	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
-	int ret;
-
-	ret = file_write_and_wait_range(filp, start, end);
-	if (ret)
-		return ret;
- 
-	inode_lock(inode);
-	/* Trigger GC to flush any pending writes for this inode */
-	jffs2_flush_wbuf_gc(c, inode->i_ino);
-	inode_unlock(inode);
 +static unsigned char gc_buffer[PAGE_SIZE];	//avoids malloc when user may be under memory pressure
 
-	return 0;
-}
- 
-const struct file_operations jffs2_file_operations =
+-int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
 +unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
 +				   struct jffs2_inode_info *f,
 +				   unsigned long offset,
 +				   unsigned long *priv)
 {
+-	struct inode *inode = filp->f_mapping->host;
+-	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
+	/* FIXME: This works only with one file system mounted at a time */
+ 	int ret;
+-
+-	ret = file_write_and_wait_range(filp, start, end);
+	ret = jffs2_read_inode_range(c, f, gc_buffer,
+			 offset & ~(PAGE_SIZE-1), PAGE_SIZE);
+ 	if (ret)
+-		return ret;
+-
+-	inode_lock(inode);
+-	/* Trigger GC to flush any pending writes for this inode */
+-	jffs2_flush_wbuf_gc(c, inode->i_ino);
+-	inode_unlock(inode);
+-
+-	return 0;
+-}
+-
+-const struct file_operations jffs2_file_operations =
+-{
 -	.llseek =	generic_file_llseek,
 -	.open =		generic_file_open,
 - 	.read_iter =	generic_file_read_iter,
@@ -2395,9 +2398,8 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
 -	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -	unsigned char *pg_buf;
-+	/* FIXME: This works only with one file system mounted at a time */
- 	int ret;
- 
+-	int ret;
+-
 -	jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n",
 -		  __func__, inode->i_ino, pg->index << PAGE_SHIFT);
 -
@@ -2436,18 +2438,15 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -{
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host);
 -	int ret;
-+	ret = jffs2_read_inode_range(c, f, gc_buffer,
-+			 offset & ~(PAGE_SIZE-1), PAGE_SIZE);
-+	if (ret)
-+		return ERR_PTR(ret);
- 
+-
 -	mutex_lock(&f->sem);
 -	ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
 -	mutex_unlock(&f->sem);
 -	return ret;
+		return ERR_PTR(ret);
 +	return gc_buffer;
 }
-
+ 
 -static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
 -			loff_t pos, unsigned len, unsigned flags,
 -			struct page **pagep, void **fsdata)
@@ -2458,20 +2457,15 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	struct page *pg;
 -	struct inode *inode = mapping->host;
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
+-	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -	pgoff_t index = pos >> PAGE_SHIFT;
 -	uint32_t pageofs = index << PAGE_SHIFT;
 -	int ret = 0;
 -
-	pg = grab_cache_page_write_begin(mapping, index, flags);
-	if (!pg)
-		return -ENOMEM;
-	*pagep = pg;
-
 -	jffs2_dbg(1, "%s()\n", __func__);
 -
 -	if (pageofs > inode->i_size) {
 -		/* Make new hole frag from old EOF to new page */
-		struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -		struct jffs2_raw_inode ri;
 -		struct jffs2_full_dnode *fn;
 -		uint32_t alloc_len;
@@ -2482,7 +2476,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -		ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,
 -					  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
 -		if (ret)
-			goto out_page;
+-			goto out_err;
 -
 -		mutex_lock(&f->sem);
 -		memset(&ri, 0, sizeof(ri));
@@ -2512,7 +2506,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			ret = PTR_ERR(fn);
 -			jffs2_complete_reservation(c);
 -			mutex_unlock(&f->sem);
-			goto out_page;
+-			goto out_err;
 -		}
 -		ret = jffs2_add_full_dnode_to_inode(c, f, fn);
 -		if (f->metadata) {
@@ -2527,7 +2521,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			jffs2_free_full_dnode(fn);
 -			jffs2_complete_reservation(c);
 -			mutex_unlock(&f->sem);
-			goto out_page;
+-			goto out_err;
 -		}
 -		jffs2_complete_reservation(c);
 -		inode->i_size = pageofs;
@@ -2535,6 +2529,19 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	}
 -
 -	/*
+-	 * While getting a page and reading data in, lock c->alloc_sem until
+-	 * the page is Uptodate. Otherwise GC task may attempt to read the same
+-	 * page in read_cache_page(), which causes a deadlock.
+-	 */
+-	mutex_lock(&c->alloc_sem);
+-	pg = grab_cache_page_write_begin(mapping, index, flags);
+-	if (!pg) {
+-		ret = -ENOMEM;
+-		goto release_sem;
+-	}
+-	*pagep = pg;
+-
+-	/*
 -	 * Read in the page if it wasn't already present. Cannot optimize away
 -	 * the whole page write case until jffs2_write_end can handle the
 -	 * case of a short-copy.
@@ -2543,19 +2550,20 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -		mutex_lock(&f->sem);
 -		ret = jffs2_do_readpage_nolock(inode, pg);
 -		mutex_unlock(&f->sem);
-		if (ret)
-			goto out_page;
+-		if (ret) {
+-			unlock_page(pg);
+-			put_page(pg);
+-			goto release_sem;
+-		}
 -	}
 -	jffs2_dbg(1, "end write_begin(). pg->flags %lx\n", pg->flags);
-	return ret;
 -
-out_page:
-	unlock_page(pg);
-	put_page(pg);
+-release_sem:
+-	mutex_unlock(&c->alloc_sem);
+-out_err:
 -	return ret;
-+	/* Do nothing */
- }
- 
+-}
+-
 -static int jffs2_write_end(struct file *filp, struct address_space *mapping,
 -			loff_t pos, unsigned len, unsigned copied,
 -			struct page *pg, void *fsdata)
@@ -2653,7 +2661,8 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	unlock_page(pg);
 -	put_page(pg);
 -	return writtenlen > 0 ? writtenlen : ret;
-}
+	/* Do nothing */
+ }
 diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 --- old/fs/jffs2/fs.c	2022-05-09 17:22:53.000000000 +0800
 +++ new/fs/jffs2/fs.c	2022-05-10 16:13:37.830000000 +0800
@@ -5499,7 +5508,7 @@ diff -Nupr old/fs/jffs2/readinode.c new/fs/jffs2/readinode.c
 			break;
 
 		default:
-+		    JFFS2_ERROR("Unknow f->inocache->state %d!\n", f->inocache->state);
+		    JFFS2_ERROR("Unknown f->inocache->state %d!\n", f->inocache->state);
 			BUG();
 		}
 	}
--- a/fs/jffs2/src/vfs_jffs2.c
+++ b/fs/jffs2/src/vfs_jffs2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -682,7 +682,6 @@ int VfsJffs2Rmdir(struct Vnode *parentVnode, struct Vnode *targetVnode, const ch
    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);

    ret = jffs2_rmdir(parentInode, targetInode, (const unsigned char *)path);
-
    if (ret == 0) {
        (void)jffs2_iput(targetInode);
    }
@@ -781,7 +780,6 @@ ssize_t VfsJffs2Readlink(struct Vnode *vnode, char *buffer, size_t bufLen)

    cnt = (bufLen - 1) < targetLen ? (bufLen - 1) : targetLen;
    if (LOS_CopyFromKernel(buffer, bufLen, (const char *)f->target, cnt) != 0) {
-        cnt = 0;
        LOS_MuxUnlock(&g_jffs2FsLock);
        return -EFAULT;
    }
@@ -809,7 +807,6 @@ int VfsJffs2Unlink(struct Vnode *parentVnode, struct Vnode *targetVnode, const c
    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);

    ret = jffs2_unlink(parentInode, targetInode, (const unsigned char *)path);
-
    if (ret == 0) {
        (void)jffs2_iput(targetInode);
    }
--- a/fs/proc/include/proc_fs.h
+++ b/fs/proc/include/proc_fs.h
@@ -137,7 +137,7 @@ struct ProcData {
 #define S_IALLUGO (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)

 /**
- * Interface for modules using proc below internal proc moudule;
+ * Interface for modules using proc below internal proc module;
 */
 /**
 * @ingroup  procfs
--- a/fs/proc/os_adapt/fd_proc.c
+++ b/fs/proc/os_adapt/fd_proc.c
@@ -135,7 +135,7 @@ void ProcFdInit(void)
 {
    struct ProcDirEntry *pde = CreateProcEntry("fd", 0, NULL);
    if (pde == NULL) {
-        PRINT_ERR("creat /proc/fd error.\n");
+        PRINT_ERR("create /proc/fd error.\n");
        return;
    }

--- a/fs/proc/os_adapt/fs_cache_proc.c
+++ b/fs/proc/os_adapt/fs_cache_proc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -154,7 +154,8 @@ static int FsCacheInfoFill(struct SeqBuf *buf, void *arg)

    VnodeHold();
    LosBufPrintf(buf, "\n=================================================================\n");
-    LosBufPrintf(buf, "VnodeAddr     ParentAddr     DataAddr      VnodeOps      Hash          Ref    Type    Gid    Uid    Mode\n");
+    LosBufPrintf(buf,
+        "VnodeAddr     ParentAddr     DataAddr      VnodeOps      Hash           Ref    Type    Gid    Uid    Mode\n");
    vnodeVirtual = VnodeListProcess(buf, GetVnodeVirtualList());
    vnodeFree = VnodeListProcess(buf, GetVnodeFreeList());
    vnodeActive = VnodeListProcess(buf, GetVnodeActiveList());
--- a/fs/proc/os_adapt/mounts_proc.c
+++ b/fs/proc/os_adapt/mounts_proc.c
@@ -91,7 +91,7 @@ void ProcMountsInit(void)
 {
    struct ProcDirEntry *pde = CreateProcEntry("mounts", 0, NULL);
    if (pde == NULL) {
-        PRINT_ERR("creat mounts error!\n");
+        PRINT_ERR("create mounts error!\n");
        return;
    }

--- a/fs/proc/os_adapt/uptime_proc.c
+++ b/fs/proc/os_adapt/uptime_proc.c
@@ -78,7 +78,7 @@ void ProcUptimeInit(void)
 {
    struct ProcDirEntry *pde = CreateProcEntry("uptime", 0, NULL);
    if (pde == NULL) {
-        PRINT_ERR("creat /proc/uptime error!\n");
+        PRINT_ERR("create /proc/uptime error!\n");
        return;
    }

--- a/fs/proc/src/proc_file.c
+++ b/fs/proc/src/proc_file.c
@@ -62,8 +62,9 @@ static struct ProcDirEntry g_procRootDirEntry = {

 int ProcMatch(unsigned int len, const char *name, struct ProcDirEntry *pn)
 {
-    if (len != pn->nameLen)
+    if (len != pn->nameLen) {
        return 0;
+    }
    return !strncmp(name, pn->name, len);
 }

@@ -387,8 +388,9 @@ static void FreeProcEntry(struct ProcDirEntry *entry)

 void ProcFreeEntry(struct ProcDirEntry *pn)
 {
-    if (atomic_dec_and_test(&pn->count))
+    if (atomic_dec_and_test(&pn->count)) {
        FreeProcEntry(pn);
+    }
 }

 static void RemoveProcEntryTravalsal(struct ProcDirEntry *pn)
--- a/fs/proc/src/proc_shellcmd.c
+++ b/fs/proc/src/proc_shellcmd.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -62,8 +62,8 @@ int OsShellCmdWriteProc(int argc, char **argv)

    if (argc == WRITEPROC_ARGC) {
        value = argv[0];
-        path = argv[2];
-        len = strlen(value) + 1;  /* +1:add the \0 */
+        path = argv[2]; // 2: index of path
+        len = strlen(value) + 1;  /* + 1:add the \0 */
        if (strncmp(argv[1], ">>", strlen(">>")) == 0) {
            if ((realpath(path, realPath) == NULL) || (strncmp(realPath, rootProcDir, strlen(rootProcDir)) != 0)) {
                PRINT_ERR("No such file or directory\n");
--- a/fs/vfs/bcache/src/bcache.c
+++ b/fs/vfs/bcache/src/bcache.c
@@ -581,8 +581,8 @@ static OsBcacheBlock *AllocNewBlock(OsBcache *bc, BOOL read, UINT64 num)
        DelBlock(bc, prefer);
    }

-    if (prefer->used) {
-        MergeSyncBlocks(bc, prefer);
+    if (prefer->used) { /* do not combine with next check */
+        MergeSyncBlocks(bc, prefer); /* prefer->used may be changed here */
    }

    if (prefer->used) {
--- a/fs/vfs/epoll/fs_epoll.c
+++ b/fs/vfs/epoll/fs_epoll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -304,7 +304,7 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout
    int pollSize;

    epHead = EpollGetDataBuff(epfd);
-    if (epHead== NULL) {
+    if (epHead == NULL) {
        set_errno(EBADF);
        return -1;
    }
--- a/fs/vfs/include/bcache/bcache.h
+++ b/fs/vfs/include/bcache/bcache.h
@@ -138,7 +138,7 @@ typedef struct tagOsBcache {
 * <li>The block number is automatically adjusted if position is greater than block size.</li>
 * </ul>
 *
- * @retval #0           read succeded
+ * @retval #0           read succeeded
 * @retval #INT32       read failed
 *
 * @par Dependency:
@@ -168,7 +168,7 @@ INT32 BlockCacheRead(OsBcache *bc,
 * <li>The block number is automatically adjusted if position is greater than block size.</li>
 * </ul>
 *
- * @retval #0           write succeded
+ * @retval #0           write succeeded
 * @retval #INT32       write failed
 *
 * @par Dependency:
@@ -193,7 +193,7 @@ INT32 BlockCacheWrite(OsBcache *bc,
 * <li>None.</li>
 * </ul>
 *
- * @retval #0           sync succeded
+ * @retval #0           sync succeeded
 * @retval #INT32       sync failed
 *
 * @par Dependency:
@@ -219,7 +219,7 @@ INT32 BlockCacheSync(OsBcache *bc);
 * <li>None.</li>
 * </ul>
 *
- * @retval #OsBcache *      init succeded
+ * @retval #OsBcache *      init succeeded
 * @retval #NULL            init failed
 *
 * @par Dependency:
--- a/fs/vfs/include/vnode.h
+++ b/fs/vfs/include/vnode.h
@@ -160,7 +160,7 @@ typedef int VfsHashCmp(struct Vnode *vnode, void *arg);

 int VnodesInit(void);
 int VnodeDevInit(void);
-int VnodeAlloc(struct VnodeOps *vop, struct Vnode **vnode);
+int VnodeAlloc(struct VnodeOps *vop, struct Vnode **newVnode);
 int VnodeFree(struct Vnode *vnode);
 int VnodeLookup(const char *path, struct Vnode **vnode, uint32_t flags);
 int VnodeLookupFullpath(const char *fullpath, struct Vnode **vnode, uint32_t flags);
--- a/fs/vfs/operation/fullpath.c
+++ b/fs/vfs/operation/fullpath.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -225,7 +225,6 @@ static char *vfs_normalize_fullpath(const char *directory, const char *filename,
        /* it's a absolute path, use it directly */

        fullpath = strdup(filename); /* copy string */
-
        if (fullpath == NULL) {
            *pathname = NULL;
            set_errno(ENOMEM);
@@ -258,11 +257,10 @@ int vfs_normalize_path(const char *directory, const char *filename, char **pathn
    }

 #ifdef VFS_USING_WORKDIR
-    if (directory == NULL)
-      {
+    if (directory == NULL) {
        spin_lock_irqsave(&curr->files->workdir_lock, lock_flags);
        directory = curr->files->workdir;
-      }
+    }
 #else
    if ((directory == NULL) && (filename[0] != '/')) {
        PRINT_ERR("NO_WORKING_DIR\n");
@@ -275,20 +273,18 @@ int vfs_normalize_path(const char *directory, const char *filename, char **pathn

    if ((filename[0] != '/') && (strlen(directory) + namelen + 2 > TEMP_PATH_MAX)) {
 #ifdef VFS_USING_WORKDIR
-        if (dir_flags == TRUE)
-          {
+        if (dir_flags == TRUE) {
            spin_unlock_irqrestore(&curr->files->workdir_lock, lock_flags);
-          }
+        }
 #endif
        return -ENAMETOOLONG;
    }

    fullpath = vfs_normalize_fullpath(directory, filename, pathname, namelen);
 #ifdef VFS_USING_WORKDIR
-    if (dir_flags == TRUE)
-      {
+    if (dir_flags == TRUE) {
        spin_unlock_irqrestore(&curr->files->workdir_lock, lock_flags);
-      }
+    }
 #endif
    if (fullpath == NULL) {
        return -get_errno();
@@ -308,7 +304,7 @@ int vfs_normalize_path(const char *directory, const char *filename, char **pathn

 int vfs_normalize_pathat(int dirfd, const char *filename, char **pathname)
 {
-    /* Get path by dirfd*/
+    /* Get path by dirfd */
    char *relativeoldpath = NULL;
    char *fullpath = NULL;
    int ret = 0;
--- a/fs/vfs/operation/vfs_force_umount.c
+++ b/fs/vfs/operation/vfs_force_umount.c
@@ -353,7 +353,7 @@ static struct file_operations_vfs g_errorFileOps = {
    .unlink = ErrorFopUnlink,
 };

-static struct Mount* GetDevMountPoint(struct Vnode *dev)
+static struct Mount* GetDevMountPoint(const struct Vnode *dev)
 {
    struct Mount *mnt = NULL;
    LIST_HEAD *mntList = GetMountList();
@@ -394,7 +394,7 @@ static void FilePreClose(struct file *filep, const struct file_operations_vfs *o
    }
 }

-static void FileDisableAndClean(struct Mount *mnt)
+static void FileDisableAndClean(const struct Mount *mnt)
 {
    struct filelist *flist = &tg_filelist;
    struct file *filep = NULL;
@@ -435,7 +435,7 @@ static void VnodeTryFree(struct Vnode *vnode)
    vnode->fop = &g_errorFileOps;
 }

-static void VnodeTryFreeAll(struct Mount *mount)
+static void VnodeTryFreeAll(const struct Mount *mount)
 {
    struct Vnode *vnode = NULL;
    struct Vnode *nextVnode = NULL;
--- a/fs/vfs/operation/vfs_other.c
+++ b/fs/vfs/operation/vfs_other.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -132,19 +132,19 @@ int VfsPermissionCheck(uint fuid, uint fgid, uint fileMode, int accMode)
 #ifdef VFS_USING_WORKDIR
 static int SetWorkDir(const char *dir, size_t len)
 {
-  errno_t ret;
-  uint lock_flags;
-  LosProcessCB *curr = OsCurrProcessGet();
+    errno_t ret;
+    uint lock_flags;
+    LosProcessCB *curr = OsCurrProcessGet();

-  spin_lock_irqsave(&curr->files->workdir_lock, lock_flags);
-  ret = strncpy_s(curr->files->workdir, PATH_MAX, dir, len);
-  curr->files->workdir[PATH_MAX - 1] = '\0';
-  spin_unlock_irqrestore(&curr->files->workdir_lock, lock_flags);
-  if (ret != EOK) {
-      return -1;
-  }
+    spin_lock_irqsave(&curr->files->workdir_lock, lock_flags);
+    ret = strncpy_s(curr->files->workdir, PATH_MAX, dir, len);
+    curr->files->workdir[PATH_MAX - 1] = '\0';
+    spin_unlock_irqrestore(&curr->files->workdir_lock, lock_flags);
+    if (ret != EOK) {
+        return -1;
+    }

-  return 0;
+        return 0;
 }
 #endif

@@ -155,7 +155,6 @@ int chdir(const char *path)
    char *fullpath_bak = NULL;
    struct stat statBuff;

-
    if (!path) {
        set_errno(EFAULT);
        return -1;
--- a/fs/vfs/operation/vfs_utime.c
+++ b/fs/vfs/operation/vfs_utime.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -57,7 +57,6 @@ int utime(const char *path, const struct utimbuf *ptimes)

    /* Sanity checks */

-
    if (path == NULL) {
        ret = -EINVAL;
        goto errout;
--- a/fs/vfs/operation/vfs_writev.c
+++ b/fs/vfs/operation/vfs_writev.c
@@ -66,7 +66,6 @@ static int iov_trans_to_buf(char *buf, ssize_t totallen, const struct iovec *iov
            } else {
                writepart = bytestowrite - ret;
                curbuf += writepart;
-                totallen -= writepart;
                break;
            }
        }
--- a/fs/vfs/vfs_cmd/vfs_shellcmd.c
+++ b/fs/vfs/vfs_cmd/vfs_shellcmd.c
--- a/fs/vfs/vnode.c
+++ b/fs/vfs/vnode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -239,7 +239,7 @@ BOOL VnodeInUseIter(const struct Mount *mount)
    return FALSE;
 }

-int VnodeHold()
+int VnodeHold(void)
 {
    int ret = LOS_MuxLock(&g_vnodeMux, LOS_WAIT_FOREVER);
    if (ret != LOS_OK) {
@@ -248,7 +248,7 @@ int VnodeHold()
    return ret;
 }

-int VnodeDrop()
+int VnodeDrop(void)
 {
    int ret = LOS_MuxUnlock(&g_vnodeMux);
    if (ret != LOS_OK) {
@@ -583,7 +583,7 @@ int VnodeCreate(struct Vnode *parent, const char *name, int mode, struct Vnode *
    return 0;
 }

-int VnodeDevInit()
+int VnodeDevInit(void)
 {
    struct Vnode *devNode = NULL;
    struct Mount *devMount = NULL;
@@ -616,7 +616,7 @@ int VnodeGetattr(struct Vnode *vnode, struct stat *buf)
    return LOS_OK;
 }

-struct Vnode *VnodeGetRoot()
+struct Vnode *VnodeGetRoot(void)
 {
    return g_rootVnode;
 }
@@ -697,7 +697,7 @@ LIST_HEAD* GetVnodeActiveList()
    return &g_vnodeActiveList;
 }

-int VnodeClearCache()
+int VnodeClearCache(void)
 {
    struct Vnode *item = NULL;
    struct Vnode *nextItem = NULL;
--- a/kernel/base/Makefile
+++ b/kernel/base/Makefile
@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 include $(LITEOSTOPDIR)/config.mk
-include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
+include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk

 MODULE_NAME := $(notdir $(shell pwd))

--- a/kernel/base/include/los_sem_debug_pri.h
+++ b/kernel/base/include/los_sem_debug_pri.h
@@ -61,11 +61,11 @@ STATIC INLINE VOID OsSemDbgTimeUpdateHook(UINT32 semID)
    return;
 }
 /* Update the SEM_DEBUG_CB of the semaphore when created or deleted */
-extern VOID OsSemDbgUpdate(UINT32 semID, TSK_ENTRY_FUNC creater, UINT16 count);
-STATIC INLINE VOID OsSemDbgUpdateHook(UINT32 semID, TSK_ENTRY_FUNC creater, UINT16 count)
+extern VOID OsSemDbgUpdate(UINT32 semID, TSK_ENTRY_FUNC creator, UINT16 count);
+STATIC INLINE VOID OsSemDbgUpdateHook(UINT32 semID, TSK_ENTRY_FUNC creator, UINT16 count)
 {
 #ifdef LOSCFG_DEBUG_SEMAPHORE
-    OsSemDbgUpdate(semID, creater, count);
+    OsSemDbgUpdate(semID, creator, count);
 #endif
    return;
 }
--- a/kernel/base/include/los_vm_dump.h
+++ b/kernel/base/include/los_vm_dump.h
@@ -70,7 +70,7 @@ VOID OsVmPhysDump(VOID);
 VOID OsVmPhysUsedInfoGet(UINT32 *usedCount, UINT32 *totalCount);
 INT32 OsRegionOverlapCheck(LosVmSpace *space, LosVmMapRegion *region);
 VOID OsDumpPte(VADDR_T vaddr);
-LosProcessCB *OsGetPIDByAspace(LosVmSpace *space);
+LosProcessCB *OsGetPIDByAspace(const LosVmSpace *space);
 CHAR *OsArchFlagsToStr(const UINT32 archFlags);

 #ifdef __cplusplus
--- a/kernel/base/include/los_vm_filemap.h
+++ b/kernel/base/include/los_vm_filemap.h
@@ -193,7 +193,7 @@ VOID OsVmmFileRegionFree(struct file *filep, LosProcessCB *processCB);

 LosFilePage *OsPageCacheAlloc(struct page_mapping *mapping, VM_OFFSET_T pgoff);
 LosFilePage *OsFindGetEntry(struct page_mapping *mapping, VM_OFFSET_T pgoff);
-LosMapInfo *OsGetMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr);
+LosMapInfo *OsGetMapInfo(const LosFilePage *page, const LosArchMmu *archMmu, VADDR_T vaddr);
 VOID OsAddMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr);
 VOID OsDelMapInfo(LosVmMapRegion *region, LosVmPgFault *pgFault, BOOL cleanDirty);
 VOID OsFileCacheFlush(struct page_mapping *mapping);
@@ -208,7 +208,7 @@ VOID OsDeletePageCacheLru(LosFilePage *page);
 VOID OsPageRefDecNoLock(LosFilePage *page);
 VOID OsPageRefIncLocked(LosFilePage *page);
 int OsTryShrinkMemory(size_t nPage);
-VOID OsMarkPageDirty(LosFilePage *fpage, LosVmMapRegion *region, int off, int len);
+VOID OsMarkPageDirty(LosFilePage *fpage, const LosVmMapRegion *region, int off, int len);

 #ifdef LOSCFG_DEBUG_VERSION
 VOID ResetPageCacheHitInfo(int *try, int *hit);
--- a/kernel/base/ipc/los_queue_debug.c
+++ b/kernel/base/ipc/los_queue_debug.c
@@ -40,7 +40,7 @@
 #ifdef LOSCFG_DEBUG_QUEUE

 typedef struct {
-    TSK_ENTRY_FUNC creater; /* The task entry who created this queue */
+    TSK_ENTRY_FUNC creator; /* The task entry who created this queue */
    UINT64  lastAccessTime; /* The last access time */
 } QueueDebugCB;
 STATIC QueueDebugCB *g_queueDebugArray = NULL;
@@ -74,7 +74,7 @@ VOID OsQueueDbgTimeUpdate(UINT32 queueID)
 VOID OsQueueDbgUpdate(UINT32 queueID, TSK_ENTRY_FUNC entry)
 {
    QueueDebugCB *queueDebug = &g_queueDebugArray[GET_QUEUE_INDEX(queueID)];
-    queueDebug->creater = entry;
+    queueDebug->creator = entry;
    queueDebug->lastAccessTime = LOS_TickCountGet();
    return;
 }
@@ -91,8 +91,8 @@ STATIC INLINE VOID OsQueueInfoOutPut(const LosQueueCB *node)

 STATIC INLINE VOID OsQueueOpsOutput(const QueueDebugCB *node)
 {
-    PRINTK("TaskEntry of creater:0x%p, Latest operation time: 0x%llx\n",
-           node->creater, node->lastAccessTime);
+    PRINTK("TaskEntry of creator:0x%p, Latest operation time: 0x%llx\n",
+           node->creator, node->lastAccessTime);
 }

 STATIC VOID SortQueueIndexArray(UINT32 *indexArray, UINT32 count)
@@ -149,7 +149,7 @@ VOID OsQueueCheck(VOID)
                       &g_queueDebugArray[index], sizeof(QueueDebugCB));
        SCHEDULER_UNLOCK(intSave);
        if ((queueNode.queueState == OS_QUEUE_UNUSED) ||
-            ((queueNode.queueState == OS_QUEUE_INUSED) && (queueDebugNode.creater == NULL))) {
+            ((queueNode.queueState == OS_QUEUE_INUSED) && (queueDebugNode.creator == NULL))) {
            continue;
        }
        if ((queueNode.queueState == OS_QUEUE_INUSED) &&
--- a/kernel/base/ipc/los_rwlock.c
+++ b/kernel/base/ipc/los_rwlock.c
@@ -96,7 +96,7 @@ UINT32 LOS_RwlockDestroy(LosRwlock *rwlock)
    return LOS_OK;
 }

-STATIC UINT32 OsRwlockCheck(LosRwlock *rwlock)
+STATIC UINT32 OsRwlockCheck(const LosRwlock *rwlock)
 {
    if (rwlock == NULL) {
        return LOS_EINVAL;
--- a/kernel/base/ipc/los_sem_debug.c
+++ b/kernel/base/ipc/los_sem_debug.c
@@ -80,7 +80,7 @@ STATIC VOID OsSemPendedTaskNamePrint(LosSemCB *semNode)
 typedef struct {
    UINT16  origSemCount;   /* Number of original available semaphores */
    UINT64  lastAccessTime; /* The last operation time */
-    TSK_ENTRY_FUNC creater; /* The task entry who created this sem */
+    TSK_ENTRY_FUNC creator; /* The task entry who created this sem */
 } SemDebugCB;
 STATIC SemDebugCB *g_semDebugArray = NULL;

@@ -110,10 +110,10 @@ VOID OsSemDbgTimeUpdate(UINT32 semID)
    return;
 }

-VOID OsSemDbgUpdate(UINT32 semID, TSK_ENTRY_FUNC creater, UINT16 count)
+VOID OsSemDbgUpdate(UINT32 semID, TSK_ENTRY_FUNC creator, UINT16 count)
 {
    SemDebugCB *semDebug = &g_semDebugArray[GET_SEM_INDEX(semID)];
-    semDebug->creater = creater;
+    semDebug->creator = creator;
    semDebug->lastAccessTime = LOS_TickCountGet();
    semDebug->origSemCount = count;
    return;
@@ -133,7 +133,7 @@ STATIC VOID OsSemSort(UINT32 *semIndexArray, UINT32 usedCount)

    /* It will Print out ALL the Used Semaphore List. */
    PRINTK("Used Semaphore List: \n");
-    PRINTK("\r\n   SemID    Count    OriginalCount   Creater(TaskEntry)    LastAccessTime\n");
+    PRINTK("\r\n   SemID    Count    OriginalCount   Creator(TaskEntry)    LastAccessTime\n");
    PRINTK("   ------   ------   -------------   ------------------    --------------   \n");

    SCHEDULER_LOCK(intSave);
@@ -145,11 +145,11 @@ STATIC VOID OsSemSort(UINT32 *semIndexArray, UINT32 usedCount)
        (VOID)memcpy_s(&semNode, sizeof(LosSemCB), semCB, sizeof(LosSemCB));
        (VOID)memcpy_s(&semDebug, sizeof(SemDebugCB), &g_semDebugArray[semIndexArray[i]], sizeof(SemDebugCB));
        SCHEDULER_UNLOCK(intSave);
-        if ((semNode.semStat != OS_SEM_USED) || (semDebug.creater == NULL)) {
+        if ((semNode.semStat != OS_SEM_USED) || (semDebug.creator == NULL)) {
            continue;
        }
        PRINTK("   0x%-07x0x%-07u0x%-14u%-22p0x%llx\n", semNode.semID, semDebug.origSemCount,
-               semNode.semCount, semDebug.creater, semDebug.lastAccessTime);
+               semNode.semCount, semDebug.creator, semDebug.lastAccessTime);
        if (!LOS_ListEmpty(&semNode.semList)) {
            OsSemPendedTaskNamePrint(semCB);
        }
@@ -170,7 +170,7 @@ UINT32 OsSemInfoGetFullData(VOID)
    for (i = 0; i < LOSCFG_BASE_IPC_SEM_LIMIT; i++) {
        semNode = GET_SEM(i);
        semDebug = &g_semDebugArray[i];
-        if ((semNode->semStat == OS_SEM_USED) && (semDebug->creater != NULL)) {
+        if ((semNode->semStat == OS_SEM_USED) && (semDebug->creator != NULL)) {
            usedSemCnt++;
        }
    }
@@ -190,7 +190,7 @@ UINT32 OsSemInfoGetFullData(VOID)
        for (i = 0; i < LOSCFG_BASE_IPC_SEM_LIMIT; i++) {
            semNode = GET_SEM(i);
            semDebug = &g_semDebugArray[i];
-            if ((semNode->semStat != OS_SEM_USED) || (semDebug->creater == NULL)) {
+            if ((semNode->semStat != OS_SEM_USED) || (semDebug->creator == NULL)) {
                continue;
            }
            *(semIndexArray + count) = i;
--- a/kernel/base/ipc/los_signal.c
+++ b/kernel/base/ipc/los_signal.c
@@ -78,7 +78,6 @@ STATIC VOID OsMoveTmpInfoToUnbInfo(sig_cb *sigcb, INT32 signo)
            /* delete tmpinfo from tmpList. */
            *prevHook = tmpInfoNode->next;
            (VOID)LOS_MemFree(m_aucSysMem0, tmpInfoNode);
-            tmpInfoNode = *prevHook;
            break;
        }
        prevHook = &tmpInfoNode->next;
@@ -284,7 +283,7 @@ static int SigProcessSignalHandler(LosTaskCB *tcb, void *arg)
        return 0;
    }

-    /* If the default tcb is not setted, then set this one as default. */
+    /* If the default tcb is not set, then set this one as default. */
    if (!info->defaultTcb) {
        info->defaultTcb = tcb;
    }
@@ -305,7 +304,7 @@ static int SigProcessSignalHandler(LosTaskCB *tcb, void *arg)
    /* Is this signal unblocked on this thread? */
    isMember = OsSigIsMember(&tcb->sig.sigprocmask, info->sigInfo->si_signo);
    if ((!isMember) && (!info->receivedTcb) && (tcb != info->awakenedTcb)) {
-        /* if unblockedTcb of this signal is not setted, then set it. */
+        /* if unblockedTcb of this signal is not set, then set it. */
        if (!info->unblockedTcb) {
            info->unblockedTcb = tcb;
        }
--- a/kernel/base/mem/tlsf/los_memory.c
+++ b/kernel/base/mem/tlsf/los_memory.c
@@ -498,7 +498,7 @@ STATIC INLINE VOID OsLmsReallocMergeNodeMark(struct OsMemNodeHead *node)
    }

    g_lms->simpleMark((UINTPTR)node + OS_MEM_NODE_HEAD_SIZE, (UINTPTR)OS_MEM_NEXT_NODE(node),
-        LMS_SHADOW_ACCESSABLE_U8);
+        LMS_SHADOW_ACCESSIBLE_U8);
 }

 STATIC INLINE VOID OsLmsReallocSplitNodeMark(struct OsMemNodeHead *node)
@@ -918,7 +918,7 @@ STATIC UINT32 OsMemPoolAdd(VOID *pool, UINT32 size)
    return LOS_OK;
 }

-STATIC UINT32 OsMemPoolDelete(VOID *pool)
+STATIC UINT32 OsMemPoolDelete(const VOID *pool)
 {
    UINT32 ret = LOS_NOK;
    VOID *nextPool = NULL;
--- a/kernel/base/mp/los_lockdep.c
+++ b/kernel/base/mp/los_lockdep.c
@@ -271,7 +271,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
 {
    UINT32 intSave;
    INT32 depth;
-    enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
+    enum LockDepErrType checkResult;
    VOID *requestAddr = (VOID *)__builtin_return_address(1);
    LosTaskCB *current = OsCurrTaskGet();
    LosTaskCB *owner = NULL;
--- a/kernel/base/vm/los_vm_dump.c
+++ b/kernel/base/vm/los_vm_dump.c
@@ -146,7 +146,6 @@ UINT32 OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
    LosVmSpace *space = NULL;
    LOS_DL_LIST *spaceList = NULL;
    UINT32 UProcessUsed = 0;
-    UINT32 pmTmp;

    if (actualPm == NULL) {
        return 0;
@@ -167,8 +166,7 @@ UINT32 OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
        if (space == LOS_GetKVmSpace()) {
            continue;
        }
-        (VOID)OsUProcessPmUsage(space, NULL, &pmTmp);
-        UProcessUsed += pmTmp;
+        UProcessUsed += OsUProcessPmUsage(space, NULL, NULL);
    }
    (VOID)LOS_MuxRelease(vmSpaceListMux);

@@ -208,15 +206,12 @@ UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
    PADDR_T paddr;
    STATUS_T ret;
    INT32 shareRef;
+    UINT32 pmSize = 0;

    if (sharePm != NULL) {
        *sharePm = 0;
    }

-    if (actualPm != NULL) {
-        *actualPm = 0;
-    }
-
    ret = LOS_MuxAcquire(&space->regionMux);
    if (ret != 0) {
        return 0;
@@ -240,22 +235,23 @@ UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
                if (sharePm != NULL) {
                    *sharePm += PAGE_SIZE;
                }
-                if (actualPm != NULL) {
-                    *actualPm += PAGE_SIZE / shareRef;
-                }
+                pmSize += PAGE_SIZE / shareRef;
            } else {
-                if (actualPm != NULL) {
-                    *actualPm += PAGE_SIZE;
-                }
+                pmSize += PAGE_SIZE;
            }
        }
    RB_SCAN_SAFE_END(&oldVmSpace->regionRbTree, pstRbNode, pstRbNodeNext)

    (VOID)LOS_MuxRelease(&space->regionMux);
-    return *actualPm;
+
+    if (actualPm != NULL) {
+        *actualPm = pmSize;
+    }
+
+    return pmSize;
 }

-LosProcessCB *OsGetPIDByAspace(LosVmSpace *space)
+LosProcessCB *OsGetPIDByAspace(const LosVmSpace *space)
 {
    UINT32 pid;
    UINT32 intSave;
@@ -305,7 +301,7 @@ UINT32 OsCountRegionPages(LosVmSpace *space, LosVmMapRegion *region, UINT32 *pss
    }

    if (pssPages != NULL) {
-        *pssPages = (UINT32)(pss + 0.5);
+        *pssPages = (UINT32)(pss + 0.5);    /* 0.5, for page alignment */
    }

    return regionPages;
--- a/kernel/base/vm/los_vm_filemap.c
+++ b/kernel/base/vm/los_vm_filemap.c
@@ -125,10 +125,10 @@ VOID OsAddMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr)
    page->n_maps++;
 }

-LosMapInfo *OsGetMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr)
+LosMapInfo *OsGetMapInfo(const LosFilePage *page, const LosArchMmu *archMmu, VADDR_T vaddr)
 {
    LosMapInfo *info = NULL;
-    LOS_DL_LIST *immap = &page->i_mmap;
+    const LOS_DL_LIST *immap = &page->i_mmap;

    LOS_DL_LIST_FOR_EACH_ENTRY(info, immap, LosMapInfo, node) {
        if ((info->archMmu == archMmu) && (info->vaddr == vaddr) && (info->page == page)) {
@@ -214,7 +214,7 @@ VOID OsVmmFileRemove(LosVmMapRegion *region, LosArchMmu *archMmu, VM_OFFSET_T pg
    return;
 }

-VOID OsMarkPageDirty(LosFilePage *fpage, LosVmMapRegion *region, INT32 off, INT32 len)
+VOID OsMarkPageDirty(LosFilePage *fpage, const LosVmMapRegion *region, INT32 off, INT32 len)
 {
    if (region != NULL) {
        OsSetPageDirty(fpage->vmPage);
--- a/kernel/base/vm/los_vm_map.c
+++ b/kernel/base/vm/los_vm_map.c
@@ -233,7 +233,7 @@ LosVmSpace *OsCreateUserVmSpace(VOID)
    return space;
 }

-STATIC BOOL OsVmSpaceParamCheck(LosVmSpace *vmSpace)
+STATIC BOOL OsVmSpaceParamCheck(const LosVmSpace *vmSpace)
 {
    if (vmSpace == NULL) {
        return FALSE;
--- a/kernel/base/vm/los_vm_scan.c
+++ b/kernel/base/vm/los_vm_scan.c
@@ -297,7 +297,7 @@ int OsTryShrinkMemory(size_t nPage)
    LosFilePage *fpage = NULL;
    LosFilePage *fnext = NULL;

-    if (nPage <= 0) {
+    if (nPage == 0) {
        nPage = VM_FILEMAP_MIN_SCAN;
    }

--- a/kernel/base/vm/los_vm_syscall.c
+++ b/kernel/base/vm/los_vm_syscall.c
@@ -166,7 +166,7 @@ MMAP_DONE:

 STATUS_T LOS_UnMMap(VADDR_T addr, size_t size)
 {
-    if ((addr <= 0) || (size <= 0)) {
+    if ((addr <= 0) || (size == 0)) {
        return -EINVAL;
    }

--- a/kernel/common/console.c
+++ b/kernel/common/console.c
@@ -404,7 +404,7 @@ STATIC VOID EchoToTerminal(CONSOLE_CB *consoleCB, struct file *filep, const stru
 {
    if (consoleCB->consoleTermios.c_lflag & ECHO) {
        if (ch == '\b') {
-            (VOID)fops->write(filep, "\b \b", 3);
+            (VOID)fops->write(filep, "\b \b", 3); // 3: length of "\b \b"
        } else {
            (VOID)fops->write(filep, &ch, EACH_CHAR);
        }
@@ -709,7 +709,6 @@ STATIC ssize_t DoWrite(CirBufSendCB *cirBufSendCB, CHAR *buffer, size_t bufLen)
 {
    INT32 cnt;
    size_t written = 0;
-    size_t toWrite = bufLen;
    UINT32 intSave;

 #ifdef LOSCFG_SHELL_DMESG
@@ -730,7 +729,6 @@ STATIC ssize_t DoWrite(CirBufSendCB *cirBufSendCB, CHAR *buffer, size_t bufLen)
        if (cnt <= 0) {
            break;
        }
-        toWrite -= cnt;
        written += cnt;
    }
    LOS_SpinUnlockRestore(&g_consoleWriteSpinLock, intSave);
@@ -1238,7 +1236,7 @@ STATIC CONSOLE_CB *OsConsoleCreate(UINT32 consoleID, const CHAR *deviceName)

    ret = (INT32)LOS_SemCreate(1, &consoleCB->consoleSem);
    if (ret != LOS_OK) {
-        PRINT_ERR("creat sem for uart failed\n");
+        PRINT_ERR("create sem for uart failed\n");
        goto ERR_WITH_BUF;
    }

@@ -1536,7 +1534,15 @@ STATIC ssize_t WriteToTerminal(const CONSOLE_CB *consoleCB, const CHAR *buffer,

    fd = consoleCB->fd;
    ret = fs_getfilep(fd, &filep);
+    if (ret < 0) {
+        ret = -EPERM;
+        goto ERROUT;
+    }
    ret = GetFilepOps(filep, &privFilep, &fileOps);
+    if (ret != ENOERR) {
+        ret = -EINVAL;
+        goto ERROUT;
+    }

    if ((fileOps == NULL) || (fileOps->write == NULL)) {
        ret = EFAULT;
--- a/kernel/common/los_init.c
+++ b/kernel/common/los_init.c
@@ -87,7 +87,6 @@ STATIC VOID InitLevelCall(const CHAR *name, const UINT32 level, struct ModuleIni
        LOS_SpinUnlock(&g_initLock);
        if (module->hook != NULL) {
 #ifdef LOS_INIT_DEBUG
-            ret = LOS_OK;
            startNsec = LOS_CurrNanosec();
            ret = (UINT32)module->hook();
            endNsec = LOS_CurrNanosec();
--- a/kernel/extended/dynload/src/los_load_elf.c
+++ b/kernel/extended/dynload/src/los_load_elf.c
@@ -51,7 +51,7 @@ STATIC BOOL g_srandInit;

 STATIC INT32 OsELFOpen(const CHAR *fileName, INT32 oflags)
 {
-    INT32 ret = -LOS_NOK;
+    INT32 ret;
    INT32 procFd;

    procFd = AllocProcessFd();
--- a/kernel/extended/hilog/los_hilog.c
+++ b/kernel/extended/hilog/los_hilog.c
@@ -233,14 +233,8 @@ static int HiLogWriteRingBuffer(unsigned char *buffer, size_t bufLen)

 static void HiLogHeadInit(struct HiLogEntry *header, size_t len)
 {
-    struct timespec now;
-    int ret;
-
-    ret = clock_gettime(CLOCK_REALTIME, &now);
-    if (ret != 0) {
-        PRINTK("In %s line %d,clock_gettime fail\n", __FUNCTION__, __LINE__);
-        return;
-    }
+    struct timespec now = {0};
+    (void)clock_gettime(CLOCK_REALTIME, &now);

    header->len = len;
    header->pid = LOS_GetCurrProcessID();
--- a/kernel/extended/liteipc/hm_liteipc.c
+++ b/kernel/extended/liteipc/hm_liteipc.c
@@ -1026,7 +1026,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckPara(IpcContent *content, UINT32 *dstTid)
 #endif
            break;
        default:
-            PRINT_DEBUG("Unknow msg type:%d\n", msg->type);
+            PRINT_DEBUG("Unknown msg type:%d\n", msg->type);
            return -EINVAL;
    }

@@ -1118,13 +1118,13 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckRecievedMsg(IpcListNode *node, IpcContent *c
            }
 #if (USE_TIMESTAMP == 1)
            if (node->msg.timestamp != content->outMsg->timestamp) {
-                PRINT_ERR("Recieve a unmatch reply, drop it\n");
+                PRINT_ERR("Receive a unmatch reply, drop it\n");
                ret = -EINVAL;
            }
 #else
            if ((node->msg.code != content->outMsg->code) ||
                (node->msg.target.token != content->outMsg->target.token)) {
-                PRINT_ERR("Recieve a unmatch reply, drop it\n");
+                PRINT_ERR("Receive a unmatch reply, drop it\n");
                ret = -EINVAL;
            }
 #endif
@@ -1132,7 +1132,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckRecievedMsg(IpcListNode *node, IpcContent *c
        case MT_DEATH_NOTIFY:
            break;
        default:
-            PRINT_ERR("Unknow msg type:%d\n", node->msg.type);
+            PRINT_ERR("Unknown msg type:%d\n", node->msg.type);
            ret =  -EINVAL;
    }
    if (ret != LOS_OK) {
@@ -1310,7 +1310,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandleCmsCmd(CmsCmdContent *content)
            }
            return AddServiceAccess(localContent.taskID, localContent.serviceHandle);
        default:
-            PRINT_DEBUG("Unknow cmd cmd:%d\n", localContent.cmd);
+            PRINT_DEBUG("Unknown cmd cmd:%d\n", localContent.cmd);
            return -EINVAL;
    }
    return ret;
@@ -1375,7 +1375,7 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
            }
            break;
        default:
-            PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd);
+            PRINT_ERR("Unknown liteipc ioctl cmd:%d\n", cmd);
            return -EINVAL;
    }
    return (INT32)ret;
--- a/kernel/extended/lms/los_lms.c
+++ b/kernel/extended/lms/los_lms.c
@@ -326,7 +326,7 @@ VOID OsLmsLosMallocMark(const VOID *curNodeStart, const VOID *nextNodeStart, UIN
    }

    OsLmsSetShadowValue(node, curNodeStartAddr, curNodeStartAddr + nodeHeadSize, LMS_SHADOW_REDZONE_U8);
-    OsLmsSetShadowValue(node, curNodeStartAddr + nodeHeadSize, nextNodeStartAddr, LMS_SHADOW_ACCESSABLE_U8);
+    OsLmsSetShadowValue(node, curNodeStartAddr + nodeHeadSize, nextNodeStartAddr, LMS_SHADOW_ACCESSIBLE_U8);
    OsLmsSetShadowValue(node, nextNodeStartAddr, nextNodeStartAddr + nodeHeadSize, LMS_SHADOW_REDZONE_U8);
    LMS_UNLOCK(intSave);
 }
@@ -344,7 +344,7 @@ VOID OsLmsCheckValid(UINTPTR checkAddr, BOOL isFreeCheck)

    OsLmsGetShadowValue(node, checkAddr, &shadowValue);
    LMS_UNLOCK(intSave);
-    if ((shadowValue == LMS_SHADOW_ACCESSABLE) || ((isFreeCheck) && (shadowValue == LMS_SHADOW_PAINT))) {
+    if ((shadowValue == LMS_SHADOW_ACCESSIBLE) || ((isFreeCheck) && (shadowValue == LMS_SHADOW_PAINT))) {
        return;
    }

@@ -367,7 +367,7 @@ VOID OsLmsLosFreeMark(const VOID *curNodeStart, const VOID *nextNodeStart, UINT3
    UINTPTR nextNodeStartAddr = (UINTPTR)nextNodeStart;

    OsLmsGetShadowValue(node, curNodeStartAddr + nodeHeadSize, &shadowValue);
-    if ((shadowValue != LMS_SHADOW_ACCESSABLE) && (shadowValue != LMS_SHADOW_PAINT)) {
+    if ((shadowValue != LMS_SHADOW_ACCESSIBLE) && (shadowValue != LMS_SHADOW_PAINT)) {
        LMS_UNLOCK(intSave);
        OsLmsReportError(curNodeStartAddr + nodeHeadSize, MEM_REGION_SIZE_1, FREE_ERRORMODE);
        return;
@@ -408,7 +408,7 @@ VOID LOS_LmsAddrDisableProtect(UINTPTR addrStart, UINTPTR addrEnd)
    LMS_LOCK(intSave);
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addrStart);
    if (node != NULL) {
-        OsLmsSetShadowValue(node, addrStart, addrEnd, LMS_SHADOW_ACCESSABLE_U8);
+        OsLmsSetShadowValue(node, addrStart, addrEnd, LMS_SHADOW_ACCESSIBLE_U8);
    }
    LMS_UNLOCK(intSave);
 }
@@ -426,7 +426,7 @@ STATIC UINT32 OsLmsCheckAddr(UINTPTR addr)
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addr);
    if (node == NULL) {
        LMS_UNLOCK(intSave);
-        return LMS_SHADOW_ACCESSABLE_U8;
+        return LMS_SHADOW_ACCESSIBLE_U8;
    }

    OsLmsGetShadowValue(node, addr, &shadowValue);
@@ -542,7 +542,7 @@ STATIC VOID OsLmsGetErrorInfo(UINTPTR addr, UINT32 size, LmsAddrInfo *info)
 {
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addr);
    OsLmsGetShadowInfo(node, addr, info);
-    if (info->shadowValue != LMS_SHADOW_ACCESSABLE_U8) {
+    if (info->shadowValue != LMS_SHADOW_ACCESSIBLE_U8) {
        return;
    } else {
        OsLmsGetShadowInfo(node, addr + size - 1, info);
@@ -558,7 +558,7 @@ STATIC VOID OsLmsPrintErrInfo(LmsAddrInfo *info, UINT32 errMod)
        case LMS_SHADOW_REDZONE:
            PRINT_ERR("Heap buffer overflow error detected\n");
            break;
-        case LMS_SHADOW_ACCESSABLE:
+        case LMS_SHADOW_ACCESSIBLE:
            PRINT_ERR("No error\n");
            break;
        default:
@@ -614,7 +614,7 @@ VOID OsLmsReportError(UINTPTR p, UINT32 size, UINT32 errMod)
 #ifdef LOSCFG_LMS_STORE_CHECK
 VOID __asan_store1_noabort(UINTPTR p)
 {
-    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
        OsLmsReportError(p, MEM_REGION_SIZE_1, STORE_ERRMODE);
    }
 }
@@ -690,7 +690,7 @@ VOID __asan_storeN_noabort(UINTPTR p, UINT32 size)
 #ifdef LOSCFG_LMS_LOAD_CHECK
 VOID __asan_load1_noabort(UINTPTR p)
 {
-    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
        OsLmsReportError(p, MEM_REGION_SIZE_1, LOAD_ERRMODE);
    }
 }
--- a/kernel/extended/lms/los_lms_pri.h
+++ b/kernel/extended/lms/los_lms_pri.h
@@ -59,13 +59,13 @@ extern "C" {
 #define LMS_POOL_RESIZE(size)          ((size) / (LMS_SHADOW_U8_REFER_BYTES + 1) * LMS_SHADOW_U8_REFER_BYTES)
 #define LMS_ADDR_ALIGN(p)              (((UINTPTR)(p) + sizeof(UINTPTR) - 1) & ~((UINTPTR)(sizeof(UINTPTR) - 1)))

-#define LMS_SHADOW_ACCESSABLE          0x00
+#define LMS_SHADOW_ACCESSIBLE          0x00
 #define LMS_SHADOW_AFTERFREE           0x03
 #define LMS_SHADOW_REDZONE             0x02
 #define LMS_SHADOW_PAINT               0x01
 #define LMS_SHADOW_MASK                0x03

-#define LMS_SHADOW_ACCESSABLE_U8       0x00
+#define LMS_SHADOW_ACCESSIBLE_U8       0x00
 #define LMS_SHADOW_AFTERFREE_U8        0xFF
 #define LMS_SHADOW_REDZONE_U8          0xAA
 #define LMS_SHADOW_MASK_U8             0xFF
--- a/kernel/extended/lms/usr/los_lms.c
+++ b/kernel/extended/lms/usr/los_lms.c
@@ -124,8 +124,8 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsSetShadowValue(uintptr_t startAddr, uintpt
    uint32_t startOffset;
    uint32_t endOffset;

-    char shadowValueMask;
-    char shadowValue;
+    unsigned char shadowValueMask;
+    unsigned char shadowValue;

    /* endAddr - 1, then we mark [startAddr, endAddr) to value */
    LmsMem2Shadow(startAddr, &shadowStart, &startOffset);
@@ -174,7 +174,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsGetShadowValue(uintptr_t addr, uint32_t *s
    LmsMem2Shadow(addr, &shadowAddr, &shadowOffset);
    /* If the shadow addr is not mapped then regarded as legal access */
    if (LmsIsShadowAddrMapped(shadowAddr, shadowAddr) != LMS_OK) {
-        *shadowValue = LMS_SHADOW_ACCESSABLE_U8;
+        *shadowValue = LMS_SHADOW_ACCESSIBLE_U8;
        return;
    }

@@ -185,7 +185,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsMallocMark(uintptr_t preRzStart, uintptr_t
    uintptr_t RzEndAddr)
 {
    LmsSetShadowValue(preRzStart, accessMemStart, LMS_SHADOW_REDZONE_U8);
-    LmsSetShadowValue(accessMemStart, nextRzStart, LMS_SHADOW_ACCESSABLE_U8);
+    LmsSetShadowValue(accessMemStart, nextRzStart, LMS_SHADOW_ACCESSIBLE_U8);
    LmsSetShadowValue(nextRzStart, RzEndAddr, LMS_SHADOW_REDZONE_U8);
 }

@@ -266,7 +266,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsPrintMemInfo(uintptr_t addr)
            }
        }

-        LMS_OUTPUT_INFO("|\t[0x%x | %2d]: ", shadowAddr, shadowOffset);
+        LMS_OUTPUT_INFO("|\t[0x%x | %2u]: ", shadowAddr, shadowOffset);

        for (int x = 0; x < printX; x += LMS_MEM_BYTES_PER_SHADOW_CELL) {
            LmsGetShadowValue(dumpAddr + x, &shadowValue);
@@ -300,7 +300,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS static inline void LmsGetShadowInfo(uintptr_t memA
 ATTRIBUTE_NO_SANITIZE_ADDRESS static void LmsGetErrorInfo(uintptr_t addr, size_t size, LmsAddrInfo *info)
 {
    LmsGetShadowInfo(addr, info);
-    if (info->shadowValue != LMS_SHADOW_ACCESSABLE_U8) {
+    if (info->shadowValue != LMS_SHADOW_ACCESSIBLE_U8) {
        return;
    } else {
        LmsGetShadowInfo(addr + size - 1, info);
@@ -316,7 +316,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS static void LmsPrintErrInfo(LmsAddrInfo *info, uin
        case LMS_SHADOW_REDZONE:
            LMS_OUTPUT_ERROR("Heap buffer overflow error detected!\n");
            break;
-        case LMS_SHADOW_ACCESSABLE:
+        case LMS_SHADOW_ACCESSIBLE:
            LMS_OUTPUT_ERROR("No error!\n");
            break;
        default:
@@ -339,11 +339,11 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS static void LmsPrintErrInfo(LmsAddrInfo *info, uin
            break;
    }

-    LMS_OUTPUT_INFO("Shadow memory address: [0x%x : %d]  Shadow memory value: [%d] \n", info->shadowAddr,
+    LMS_OUTPUT_INFO("Shadow memory address: [0x%x : %u]  Shadow memory value: [%u] \n", info->shadowAddr,
        info->shadowOffset, info->shadowValue);

    LMS_OUTPUT_INFO("\n");
-    LMS_OUTPUT_INFO("%-25s%d\n", "Accessable heap addr", LMS_SHADOW_ACCESSABLE);
+    LMS_OUTPUT_INFO("%-25s%d\n", "Accessible heap addr", LMS_SHADOW_ACCESSIBLE);
    LMS_OUTPUT_INFO("%-25s%d\n", "Heap red zone", LMS_SHADOW_REDZONE);
    LMS_OUTPUT_INFO("%-25s%d\n", "Heap freed buffer", LMS_SHADOW_AFTERFREE);
    LMS_OUTPUT_INFO("\n");
@@ -373,23 +373,23 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsReportError(uintptr_t p, size_t size, uint

 void LmsCheckValid(const char *dest, const char *src)
 {
-    if (LmsCheckAddr((uintptr_t)dest) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (LmsCheckAddr((uintptr_t)dest) != LMS_SHADOW_ACCESSIBLE_U8) {
        LmsReportError((uintptr_t)dest, MEM_REGION_SIZE_1, STORE_ERRMODE);
        return;
    }

-    if (LmsCheckAddr((uintptr_t)src) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (LmsCheckAddr((uintptr_t)src) != LMS_SHADOW_ACCESSIBLE_U8) {
        LmsReportError((uintptr_t)src, MEM_REGION_SIZE_1, LOAD_ERRMODE);
        return;
    }

    for (uint32_t i = 0; *(src + i) != '\0'; i++) {
-        if (LmsCheckAddr((uintptr_t)dest + i + 1) != LMS_SHADOW_ACCESSABLE_U8) {
+        if (LmsCheckAddr((uintptr_t)dest + i + 1) != LMS_SHADOW_ACCESSIBLE_U8) {
            LmsReportError((uintptr_t)dest + i + 1, MEM_REGION_SIZE_1, STORE_ERRMODE);
            return;
        }

-        if (LmsCheckAddr((uintptr_t)src + i + 1) != LMS_SHADOW_ACCESSABLE_U8) {
+        if (LmsCheckAddr((uintptr_t)src + i + 1) != LMS_SHADOW_ACCESSIBLE_U8) {
            LmsReportError((uintptr_t)src + i + 1, MEM_REGION_SIZE_1, LOAD_ERRMODE);
            return;
        }
@@ -398,7 +398,7 @@ void LmsCheckValid(const char *dest, const char *src)

 void __asan_store1_noabort(uintptr_t p)
 {
-    if (LmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (LmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
        LmsReportError(p, MEM_REGION_SIZE_1, STORE_ERRMODE);
    }
 }
@@ -440,7 +440,7 @@ void __asan_storeN_noabort(uintptr_t p, size_t size)

 void __asan_load1_noabort(uintptr_t p)
 {
-    if (LmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
+    if (LmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
        LmsReportError(p, MEM_REGION_SIZE_1, LOAD_ERRMODE);
    }
 }
--- a/kernel/extended/lms/usr/los_lms_pri.h
+++ b/kernel/extended/lms/usr/los_lms_pri.h
@@ -50,7 +50,7 @@ extern "C" {
 #define SANITIZER_INTERFACE_ATTRIBUTE
 #define ATTRIBUTE_NO_SANITIZE_ADDRESS   __attribute__((no_sanitize_address))

-#define LMS_SHADOW_ACCESSABLE           0x00
+#define LMS_SHADOW_ACCESSIBLE           0x00
 #define LMS_SHADOW_AFTERFREE            0x03
 #define LMS_SHADOW_REDZONE              0x02
 #define LMS_SHADOW_PAINT                0x01
@@ -61,7 +61,7 @@ extern "C" {
 #define LMS_SHADOW_U8_CELL_NUM          4
 #define LMS_SHADOW_U8_REFER_BYTES       16

-#define LMS_SHADOW_ACCESSABLE_U8        0x00
+#define LMS_SHADOW_ACCESSIBLE_U8        0x00
 #define LMS_SHADOW_AFTERFREE_U8         0xFF
 #define LMS_SHADOW_REDZONE_U8           0xAA
 #define LMS_SHADOW_MASK_U8              0xFF
--- a/kernel/extended/lms/usr/los_lmslibc.c
+++ b/kernel/extended/lms/usr/los_lmslibc.c
@@ -45,7 +45,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsFree(void *ptr)
    if (LmsIsShadowAddrMapped(shadowAddr, shadowAddr) == LMS_OK) {
        uint32_t acShadowValue;
        LmsGetShadowValue((uintptr_t)ptr, &acShadowValue);
-        if (acShadowValue != LMS_SHADOW_ACCESSABLE) {
+        if (acShadowValue != LMS_SHADOW_ACCESSIBLE) {
            char erroMode = (acShadowValue == LMS_SHADOW_AFTERFREE ? FREE_ERRORMODE : UNKNOWN_ERROR);
            LmsReportError((uintptr_t)ptr, MEM_REGION_SIZE_1, erroMode);
            goto UNLOCK_OUT;
--- a/kernel/extended/perf/los_perf.c
+++ b/kernel/extended/perf/los_perf.c
@@ -289,7 +289,7 @@ STATIC UINT32 OsPerfCollectData(Event *event, PerfSampleData *data, PerfRegs *re
 * return TRUE if user haven't specified any taskId(which is supposed
 * to instrument the whole system)
 */
-STATIC INLINE BOOL OsFilterId(UINT32 id, UINT32 *ids, UINT8 idsNr)
+STATIC INLINE BOOL OsFilterId(UINT32 id, const UINT32 *ids, UINT8 idsNr)
 {
    UINT32 i;
    if (!idsNr) {
--- a/kernel/extended/power/los_pm.c
+++ b/kernel/extended/power/los_pm.c
@@ -300,7 +300,7 @@ UINT32 LOS_PmRegister(LOS_PmNodeType type, VOID *node)
    return LOS_EINVAL;
 }

-STATIC UINT32 OsPmDeviceUnregister(LosPmCB *pm, LosPmDevice *device)
+STATIC UINT32 OsPmDeviceUnregister(LosPmCB *pm, const LosPmDevice *device)
 {
    LOS_SpinLock(&g_pmSpin);
    if (pm->device == device) {
--- a/kernel/include/los_rwlock.h
+++ b/kernel/include/los_rwlock.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -50,8 +50,8 @@ extern "C" {
 * Rwlock object.
 */
 typedef struct OsRwlock {
-    INT32 magic:24;        /**< Magic number */
-    INT32 rwCount:8;       /**< Times of locking the rwlock, rwCount > 0 when rwkick is read mode, rwCount < 0
+    INT32 magic : 24;        /**< Magic number */
+    INT32 rwCount : 8;       /**< Times of locking the rwlock, rwCount > 0 when rwkick is read mode, rwCount < 0
                                when the rwlock is write mode, rwCount = 0 when the lock is free. */
    VOID *writeOwner;      /**< The current write thread that is locking the rwlock */
    LOS_DL_LIST readList;  /**< Read waiting list */
--- a/kernel/include/los_task.h
+++ b/kernel/include/los_task.h
@@ -977,7 +977,7 @@ extern UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInfo);
 *
 * @attention
 * <ul>
- * <li>If any low LOSCFG_KERNEL_CORE_NUM bit of the mask is not setted, an error is reported.</li>
+ * <li>If any low LOSCFG_KERNEL_CORE_NUM bit of the mask is not set, an error is reported.</li>
 * </ul>
 *
 * @param  uwTaskID      [IN]  Type  #UINT32 Task ID. The task id value is obtained from task creation.
@@ -987,7 +987,7 @@ extern UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInfo);
 * @retval #LOS_ERRNO_TSK_ID_INVALID                Invalid task ID.
 * @retval #LOS_ERRNO_TSK_NOT_CREATED               The task is not created.
 * @retval #LOS_ERRNO_TSK_CPU_AFFINITY_MASK_ERR     The task cpu affinity mask is incorrect.
- * @retval #LOS_OK                                  The task cpu affinity mask is successfully setted.
+ * @retval #LOS_OK                                  The task cpu affinity mask is successfully set.
 * @par Dependency:
 * <ul><li>los_task.h: the header file that contains the API declaration.</li></ul>
 * @see LOS_TaskCpuAffiGet
--- a/liteos.gni
+++ b/liteos.gni
@@ -31,7 +31,7 @@ import("$root_out_dir/config.gni")

 LITEOSTOPDIR = "//kernel/liteos_a"
 LITEOSTHIRDPARTY = "//third_party"
-HDFTOPDIR = "//drivers/adapter/khdf/liteos"
+HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"

 ARCH = ""
 if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
--- a/net/lwip-2.1/enhancement/include/lwip/fixme.h
+++ b/net/lwip-2.1/enhancement/include/lwip/fixme.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -58,7 +58,7 @@

 #define ip_addr_set_val(dest, src)  do { \
                                        IP_SET_TYPE_VAL(*dest, IP_GET_TYPE(src)); \
-                                        if(IP_IS_V6_VAL(*(src))) { \
+                                        if (IP_IS_V6_VAL(*(src))) { \
                                            ip6_addr_set(ip_2_ip6(dest), ip_2_ip6(src)); \
                                        } else { \
                                            ip4_addr_set(ip_2_ip4(dest), ip_2_ip4(src)); \
--- a/net/lwip-2.1/enhancement/src/api_shell.c
+++ b/net/lwip-2.1/enhancement/src/api_shell.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -243,7 +243,7 @@ struct ifconfig_option {
    unsigned char ethaddr[6];
    u16_t mtu;
    /* when using telnet, print to the telnet socket will result in system  */
-    /* deadlock. So we cahe the prinf data to a buf, and when the tcpip      */
+    /* deadlock. So we cache the print data to a buf, and when the tcpip    */
    /* callback returns, then print the data out to the telnet socket       */
    sys_sem_t cb_completed;
    char cb_print_buf[PRINT_BUF_LEN];
@@ -342,7 +342,7 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
    buf_len -= (unsigned int)ret;

    ret = snprintf_s(tmp, buf_len, (buf_len - 1), " MTU:%d %s", netif->mtu,
-                     netif->flags & NETIF_FLAG_UP ? "Running" : "Stop");
+                     (netif->flags & NETIF_FLAG_UP) ? "Running" : "Stop");
    if ((ret <= 0) || ((unsigned int)ret >= buf_len))
        goto out;
    tmp += ret;
@@ -356,7 +356,8 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
        buf_len -= (unsigned int)ret;
    }

-    ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n", netif->flags & NETIF_FLAG_LINK_UP ? "Link UP" : "Link Down");
+    ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n",
+                     (netif->flags & NETIF_FLAG_LINK_UP) ? "Link UP" : "Link Down");
    if ((ret <= 0) || ((unsigned int)ret >= buf_len))
        goto out;
    tmp += ret;
@@ -365,19 +366,19 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
    ret = snprintf_s(tmp, buf_len, (buf_len - 1), "\tRX packets:%u ",
                     netif->mib2_counters.ifinucastpkts + netif->mib2_counters.ifinnucastpkts);
    if ((ret <= 0) || ((unsigned int)ret >= buf_len))
-      goto out;
+        goto out;
    tmp += ret;
    buf_len -= (unsigned int)ret;

    ret = snprintf_s(tmp, buf_len, (buf_len - 1), "errors:%u ", netif->mib2_counters.ifinerrors);
    if ((ret <= 0) || ((unsigned int)ret >= buf_len))
-      goto out;
+        goto out;
    tmp += ret;
    buf_len -= (unsigned int)ret;

    ret = snprintf_s(tmp, buf_len, (buf_len - 1), "dropped:%u ", netif->mib2_counters.ifindiscards);
    if ((ret <= 0) || ((unsigned int)ret >= buf_len))
-      goto out;
+        goto out;
    tmp += ret;
    buf_len -= (unsigned int)ret;

@@ -1031,12 +1032,12 @@ u32_t lwip_ifconfig(int argc, const char **argv)
 #if LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL
    if ((ifconfig_cmd.option & IFCONFIG_OPTION_SET_IP) && IP_IS_V4_VAL((ifconfig_cmd.ip_addr))) {
      /* Create the semaphore for ip conflict detection. */
-      if (sys_sem_new(&ip_conflict_detect, 0) != ERR_OK) {
-        sys_sem_free(&ifconfig_cmd.cb_completed);
-        PRINTK("ifconfig: internal error\n");
-        return 1;
-      }
-      is_ip_conflict_signal = 1;
+        if (sys_sem_new(&ip_conflict_detect, 0) != ERR_OK) {
+            sys_sem_free(&ifconfig_cmd.cb_completed);
+            PRINTK("ifconfig: internal error\n");
+            return 1;
+        }
+        is_ip_conflict_signal = 1;
    }
 #endif /* LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL */

@@ -1057,8 +1058,8 @@ u32_t lwip_ifconfig(int argc, const char **argv)
        sys_sem_free(&ifconfig_cmd.cb_completed);
 #if LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL
        if ((ifconfig_cmd.option & IFCONFIG_OPTION_SET_IP) && IP_IS_V4_VAL((ifconfig_cmd.ip_addr))) {
-          is_ip_conflict_signal = 0;
-          sys_sem_free(&ip_conflict_detect);
+            is_ip_conflict_signal = 0;
+            sys_sem_free(&ip_conflict_detect);
        }
 #endif /* LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL */

@@ -1076,37 +1077,37 @@ u32_t lwip_ifconfig(int argc, const char **argv)
    ifconfig_cmd.cb_print_buf[PRINT_BUF_LEN - 1] = '\0';
    PRINTK("%s", ifconfig_cmd.cb_print_buf);
 #if LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL
-    /* Pend 2 seconds for waiting the arp reply if the ip is already in use.*/
+    /* Pend 2 seconds for waiting the arp reply if the ip is already in use. */
    if ((ifconfig_cmd.option & IFCONFIG_OPTION_SET_IP) && IP_IS_V4_VAL((ifconfig_cmd.ip_addr))) {
-      err = (err_t)sys_arch_sem_wait(&ip_conflict_detect, DUP_ARP_DETECT_TIME);
-      is_ip_conflict_signal = 0;
-      sys_sem_free(&ip_conflict_detect);
-      if (err < 0) {
-        /* The result neither conflict nor timeout. */
-        PRINT_ERR("ifconfig: internal error\n");
-        sys_sem_free(&ifconfig_cmd.cb_completed);
-        return 1;
-      } else if (err < DUP_ARP_DETECT_TIME) {
-        /* Duplicate use of new ip, restore it to the old one. */
-        PRINT_ERR("ifconfig: ip conflict!\n");
-        ip_addr_set_ip4_u32_val(ifconfig_cmd.ip_addr, old_ip4addr);
-        ret = tcpip_callback(lwip_ifconfig_internal, &ifconfig_cmd);
-        if (ret != ERR_OK) {
-          sys_sem_free(&ifconfig_cmd.cb_completed);
-          PRINTK("%s : tcpip_callback failed in line %d : errnu %d", __FUNCTION__, __LINE__, ret);
-          return 1;
+        err = (err_t)sys_arch_sem_wait(&ip_conflict_detect, DUP_ARP_DETECT_TIME);
+        is_ip_conflict_signal = 0;
+        sys_sem_free(&ip_conflict_detect);
+        if (err < 0) {
+            /* The result neither conflict nor timeout. */
+            PRINT_ERR("ifconfig: internal error\n");
+            sys_sem_free(&ifconfig_cmd.cb_completed);
+            return 1;
+        } else if (err < DUP_ARP_DETECT_TIME) {
+            /* Duplicate use of new ip, restore it to the old one. */
+            PRINT_ERR("ifconfig: ip conflict!\n");
+            ip_addr_set_ip4_u32_val(ifconfig_cmd.ip_addr, old_ip4addr);
+            ret = tcpip_callback(lwip_ifconfig_internal, &ifconfig_cmd);
+            if (ret != ERR_OK) {
+                sys_sem_free(&ifconfig_cmd.cb_completed);
+                PRINTK("%s : tcpip_callback failed in line %d : errnu %d", __FUNCTION__, __LINE__, ret);
+                return 1;
+            }
+            (void)sys_arch_sem_wait(&ifconfig_cmd.cb_completed, 0);
+            sys_sem_free(&ifconfig_cmd.cb_completed);
+            ifconfig_cmd.cb_print_buf[PRINT_BUF_LEN - 1] = '\0';
+            PRINTK("%s", ifconfig_cmd.cb_print_buf);
+            return 1;
        }
-        (void)sys_arch_sem_wait(&ifconfig_cmd.cb_completed, 0);
-        sys_sem_free(&ifconfig_cmd.cb_completed);
-        ifconfig_cmd.cb_print_buf[PRINT_BUF_LEN - 1] = '\0';
-        PRINTK("%s", ifconfig_cmd.cb_print_buf);
-        return 1;
-      }
    }
 #endif /* LWIP_ARP && LWIP_ENABLE_IP_CONFLICT_SIGNAL */
 #if LWIP_IPV6
    if ((ifconfig_cmd.option & IFCONFIG_OPTION_SET_IP) && IP_IS_V6_VAL(ifconfig_cmd.ip_addr)) {
-        /* Pend 2 seconds for waiting the arp reply if the ip is already in use.*/
+        /* Pend 2 seconds for waiting the arp reply if the ip is already in use. */
        retval = sys_arch_sem_wait(&dup_addr_detect, DUP_ARP_DETECT_TIME);
        is_dup_detect_initialized = 0;
        sys_sem_free(&dup_addr_detect);
@@ -1158,9 +1159,9 @@ struct arp_option {
    unsigned int ipaddr;
    /* hw addr */
    unsigned char ethaddr[6];
-    /* when using telnet, printf to the telnet socket will result in system  */
-    /* deadlock.so don't do it.cahe the data to prinf to a buf, and when     */
-    /* callback returns, then printf the data out to the telnet socket       */
+    /* when using telnet, print to the telnet socket will result in system  */
+    /* deadlock.so don't do it. cache the data to print to a buf, and when  */
+    /* callback returns, then print the data out to the telnet socket       */
    sys_sem_t cb_completed;
    char cb_print_buf[PRINT_BUF_LEN];
    int print_buf_len;
@@ -1191,7 +1192,6 @@ void lwip_arp_show_internal(struct netif *netif, char *printf_buf, unsigned int
                 || (state == ETHARP_STATE_STATIC)
 #endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
                ) && arp_table[i].netif) {
-
                if (strcmp(netif_get_name(netif), netif_get_name(arp_table[i].netif)) != 0) {
                    continue;
                }
@@ -1305,7 +1305,7 @@ void lwip_arp_internal(void *arg)
                for (netif = netif_list; netif != NULL; netif = netif->next) {
                    ret = etharp_delete_arp_entry(netif, &ipaddr);
                    if (ret == ERR_OK) {
-                        /*only can del success one time*/
+                        /* only can del success one time */
                        break;
                    }
                }
@@ -1326,7 +1326,7 @@ out:
        } else if (ret == ERR_RTE) {
            (void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Network is unreachable\n");
        } else {
-            (void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Successed\n");
+            (void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Succeeded\n");
        }
    }
 #endif
@@ -1387,7 +1387,7 @@ u32_t lwip_arp(int argc, const char **argv)
                goto arp_error;
            }
            i += 2;
-            argc -= 2;
+            argc -= 2; // 2: number of used parameters
        } else if (strcmp("-d", argv[i]) == 0 && (argc > 1)) {
            /* arp delete */
            arp_cmd.option = ARP_OPTION_DEL;
@@ -1399,8 +1399,8 @@ u32_t lwip_arp(int argc, const char **argv)
            }

            i += 2;
-            argc -= 2;
-        } else if (strcmp("-s", argv[i]) == 0 && (argc > 2)) {
+            argc -= 2; // 2: number of used parameters
+        } else if (strcmp("-s", argv[i]) == 0 && (argc > 2)) { // 2: require more than 2 parameters
            /* arp add */
            char *digit = NULL;
            u32_t macaddrlen = strlen(argv[i + 2]) + 1;
@@ -1418,7 +1418,7 @@ u32_t lwip_arp(int argc, const char **argv)
                goto arp_error;
            }

-            /*cannot add an arp entry of 127.*.*.* */
+            /* cannot add an arp entry of 127.*.*.* */
            if ((arp_cmd.ipaddr & (u32_t)0x0000007fUL) == (u32_t)0x0000007fUL) {
                PRINTK("IP address is not correct!\n");
                goto arp_error;
@@ -1452,7 +1452,7 @@ u32_t lwip_arp(int argc, const char **argv)
            }

            i += 3;
-            argc -= 3;
+            argc -= 3; // 3: number of used parameters
        } else {
            goto arp_error;
        }
@@ -1727,7 +1727,7 @@ LWIP_STATIC int osPingFunc(u32_t destip, u32_t cnt, u32_t interval, u32_t data_l
                            break;
                        }
                        intrvl -= 1000;
-                        sys_msleep(1000);
+                        sys_msleep(1000); // 1000: delay 1 s
                        if (ping_kill == 1)
                            break;
                    } while (intrvl > 0);
@@ -1819,7 +1819,7 @@ u32_t osShellPing(int argc, const char **argv)
            count = ret;
            count_set = 1;
            i += 2;
-            argc -= 2;
+            argc -= 2; // 2: nuber of arguments that has been checked
        } else if (strcmp("-t", argv[i]) == 0) {
            count = 0; /* ping forerver */
            count_set = 1;
@@ -1834,7 +1834,7 @@ u32_t osShellPing(int argc, const char **argv)

            interval = ret;
            i += 2;
-            argc -= 2;
+            argc -= 2; // 2:number of arguments that has been checked
        } else if (strcmp("-l", argv[i]) == 0 && (argc > 1)) {
            ret = atoi(argv[i + 1]);
            if (ret < 0 || ret > (int)(LWIP_MAX_UDP_RAW_SEND_SIZE - sizeof(struct icmp_echo_hdr))) {
@@ -1844,7 +1844,7 @@ u32_t osShellPing(int argc, const char **argv)
            }
            data_len = ret;
            i += 2;
-            argc -= 2;
+            argc -= 2; // 2: number of elements has been checked
        } else if (strcmp("-k", argv[i]) == 0) {
            if (ping_taskid > 0) {
                ping_kill = 1; /* stop the current ping task */
@@ -1896,7 +1896,7 @@ u32_t osShellPing(int argc, const char **argv)
        stPingTask.auwArgs[0] = dst_ipaddr.addr; /* network order */
        stPingTask.auwArgs[1] = count;
        stPingTask.auwArgs[2] = interval;
-        stPingTask.auwArgs[3] = data_len;
+        stPingTask.auwArgs[3] = data_len; // 3: index of data length
        ret = LOS_TaskCreate((UINT32 *)(&ping_taskid), &stPingTask);
        if (ret != LOS_OK) {
            PRINTK("ping_task create failed 0x%08x.\n", ret);
@@ -1923,7 +1923,7 @@ ping_error:
 SHELLCMD_ENTRY(ping_shellcmd, CMD_TYPE_EX, "ping", XARGS, (CmdCallBackFunc)osShellPing);
 #endif /* LOSCFG_SHELL */

-#else /* LWIP_EXT_POLL_SUPPORT*/
+#else /* LWIP_EXT_POLL_SUPPORT */

 u32_t osShellPing(int argc, const char **argv)
 {
@@ -2076,7 +2076,7 @@ FAILURE:
 SHELLCMD_ENTRY(ping_shellcmd, CMD_TYPE_EX, "ping", XARGS, (CmdCallBackFunc)osShellPing);
 #endif /* LOSCFG_SHELL */

-#endif /* LWIP_EXT_POLL_SUPPORT*/
+#endif /* LWIP_EXT_POLL_SUPPORT */

 #if LWIP_IPV6
 u32_t osShellPing6(int argc, const char **argv)
@@ -2175,8 +2175,6 @@ u32_t osShellPing6(int argc, const char **argv)
    /* Setting the start time of the entire ping task for statistics */
    (void)clock_gettime(CLOCK_MONOTONIC_RAW, &first);

-    nsent = 0;
-
    for (nsent = 0; nsent < ping6_params.pingcount; nsent++) {
        /* capture the start tick to calculate rtt */
        (void)clock_gettime(CLOCK_MONOTONIC_RAW, &start);
@@ -2234,13 +2232,13 @@ u32_t osShellPing6(int argc, const char **argv)
            }

            if ((u32_t)ret < sizeof(struct icmp6_echo_hdr *)) {
-                /* Drop the packet if its too short [Doesnot contain even the header !!] */
+                /* Drop the packet if its too short [Doesn't contain even the header !!] */
                PRINTK("ping6 : received ICMP echo response too short\n");
                goto REDUCE_SELECT_TIME;
            }

            /* Acceping the ICMPv6 payload. */
-            /* Here, pbuf_resp->payload wont contain IPv6 Header since its an AF_INET6 RAW Socket */
+            /* Here, pbuf_resp->payload won't contain IPv6 Header since its an AF_INET6 RAW Socket */
            iecho_resp = (struct icmp6_echo_hdr *)pbuf_resp->payload;

            if (iecho_resp->id == icmpv6_id) {
@@ -2283,7 +2281,7 @@ u32_t osShellPing6(int argc, const char **argv)

                    /* Checking if its a delayed packet */
                    if ((iecho_resp->seqno != icmpv6_seq) && (nsent < ping6_params.pingcount)) {
-                        /* Incase of delayed packet wait on socket for other response before sending a new PING */
+                        /* In case of delayed packet wait on socket for other response before sending a new PING */
                        /* We have to reduce the timeout value now when selecting on socket */
                        goto REDUCE_SELECT_TIME;
                    }
@@ -2311,9 +2309,10 @@ REDUCE_SELECT_TIME:
    PRINTK("--- %s ping statistics ---\n", argv[ping6_params.host_index]);
    PRINTK("%d packets transmitted, %d received, %.2f%% packet loss, time %dms\n",
           nsent, nrecieve, (float)(((float)(nsent - nrecieve)) * ((float)(100)) / ((float)(nsent))),
+           /* 1000: convert seconds to milliseconds, 1000000: convert nanoseconds to milliseconds */
           ((last.tv_sec - first.tv_sec) * 1000 + (last.tv_nsec - first.tv_nsec) / 1000000));
    if (nrecieve) {
-        /* Display rtt stats only if atleast one packet is received */
+        /* Display rtt stats only if at least one packet is received */
        PRINTK("rtt min/avg/max = %u/%.2f/%u ms\n", ping6_stats.min_rtt, ping6_stats.avg_rtt, ping6_stats.max_rtt);
    }

@@ -2629,7 +2628,7 @@ usage:
 SHELLCMD_ENTRY(ntpdate_shellcmd, CMD_TYPE_EX, "ntpdate", XARGS, (CmdCallBackFunc)osShellNtpdate);
 #endif /* LOSCFG_SHELL_CMD_DEBUG */

-#endif /* LWIP_SNTP*/
+#endif /* LWIP_SNTP */

 #if LWIP_DNS
 u32_t osShellDns(int argc, const char **argv)
@@ -2778,7 +2777,7 @@ int netstat_get_udp_sendQLen6(struct udp_pcb *udppcb, struct pbuf *udpbuf)
        goto FUNC_OUT;
    }

-    /* check if there is enough space for atleast udp header available */
+    /* check if there is enough space for at least udp header available */
    if (udpbuf->tot_len < UDP_HLEN) {
        goto FUNC_OUT;
    }
@@ -2866,7 +2865,7 @@ int netstat_tcp_recvq(struct tcp_pcb *tpcb)
            case NETCONN_UDP_IPV6:
 #endif
            case NETCONN_UDP:
-                SYS_ARCH_GET(((unsigned int)conn->recv_avail /*+ conn->lrcv_left*/), retVal);
+                SYS_ARCH_GET(((unsigned int)conn->recv_avail), retVal); // + conn->lrcv_left
                break;
            default:
                retVal = 0; /* ur... very ugly, damn DHCP DNS and SNTP */
@@ -2922,7 +2921,7 @@ int netstat_udp_sendq6(struct udp_pcb *upcb)
 #else
    ret = netstat_get_udp_sendQLen6(upcb, neighbor_cache[idx].q);
    if (ret >= 0) {
-      retLen += ret;
+        retLen += ret;
    }
 #endif
    return retLen;
@@ -2966,10 +2965,10 @@ int netstat_udp_sendq(struct udp_pcb *upcb)
 #else
        ret = netstat_get_udp_sendQLen(upcb, arp_table[arpidx].q);
        if (ret > 0) {
-          retLen += ret;
-          if (retLen <= 0) { // overflow, set rteLen = -1 to indicate
-            retLen = -1;
-          }
+            retLen += ret;
+            if (retLen <= 0) { // overflow, set rteLen = -1 to indicate
+                retLen = -1;
+            }
        }
 #endif
    }
@@ -2992,7 +2991,7 @@ int netstat_netconn_recvq(const struct netconn *conn)
        case NETCONN_PKT_RAW:
 #endif
        case NETCONN_UDP:
-            SYS_ARCH_GET(((unsigned int)conn->recv_avail /*+ conn->lrcv_left*/), retVal);
+            SYS_ARCH_GET(((unsigned int)conn->recv_avail), retVal); // + conn->lrcv_left
            break;
        default:
            retVal = 0; /* ur... very ugly, damn DHCP DNS and SNTP */
@@ -3019,8 +3018,8 @@ int netstat_netconn_sendq(struct netconn *conn)
 #if PF_PKT_SUPPORT
        case NETCONN_PKT_RAW:
            retVal = 0; /* always be 0 as frame send to driver directly */
-#endif
            break;
+#endif
        case NETCONN_UDP:
            retVal = netstat_udp_sendq(conn->pcb.udp);
            break;
@@ -3169,7 +3168,6 @@ void netstat_internal(void *ctx)
        }

        /* For listen PCBs */
-        recvQlen = 0;
        sendQlen = 0;

        for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
@@ -3271,10 +3269,10 @@ void netstat_internal(void *ctx)
            recvQlen = netstat_netconn_recvq(rpcb->recv_arg);
            sendQlen = netstat_netconn_sendq(rpcb->recv_arg);

-            proto = rpcb->protocol;//raw_proto;
+            proto = rpcb->protocol; // raw_proto;
            iRet = snprintf_s((char *)(entry_buf + entry_buf_offset), entry_buf_len, entry_buf_len - 1,
                              "%-8s%-12d%-12d%-20s%-20s%-16u%-16d\n",
-                              "raw", recvQlen, sendQlen, local_ip_port, remote_ip_port, proto, /*rpcb->hdrincl*/0);
+                              "raw", recvQlen, sendQlen, local_ip_port, remote_ip_port, proto, 0); // rpcb->hdrincl
            if ((iRet <= 0) || ((u32_t)(iRet) >= entry_buf_len)) {
                goto out;
            }
@@ -3297,7 +3295,8 @@ void netstat_internal(void *ctx)
            sendQlen = netstat_netconn_sendq(rpcb->recv_arg);

            for (netif = netif_list; netif != NULL; netif = netif->next) {
-                if (netif_get_index(netif)/*netif->ifindex*/ == rpcb->netif_idx/*index*/) {
+                /* netif->ifindex and index */
+                if (netif_get_index(netif) == rpcb->netif_idx) {
                    (void)snprintf_s((char *)netif_name, IFNAMSIZ, IFNAMSIZ - 1, "%s", netif_get_name(netif));
                    break;
                }
@@ -3307,7 +3306,7 @@ void netstat_internal(void *ctx)
                (void)snprintf_s((char *)netif_name, IFNAMSIZ, IFNAMSIZ - 1, "%s", "None");
            }

-            proto = rpcb->protocol;//ntohs(rpcb->proto.eth_proto);
+            proto = rpcb->protocol; // ntohs(rpcb->proto.eth_proto);

            iRet = snprintf_s((char *)(entry_buf + entry_buf_offset), entry_buf_len, entry_buf_len - 1,
                              "%-12s%-12d%-12d%-16x%-12s\n", "pkt-raw", recvQlen, sendQlen, proto, netif_name);
@@ -3668,7 +3667,7 @@ u32_t netdebug_sock(int argc, const char **argv)
    int idx;
    u32_t ret = LOS_NOK;

-    if (argc == 2) {
+    if (argc == 2) { /* 2: Number of command parameters */
        if (!strcmp("-i", argv[1])) {
            /* netdebug sock -i */
            for (idx = 0; idx < (int)LWIP_CONFIG_NUM_SOCKETS; idx++) {
@@ -3676,10 +3675,9 @@ u32_t netdebug_sock(int argc, const char **argv)
            }
            ret = LOS_OK;
        }
-    } else if (argc == 3) {
+    } else if (argc == 3) { /* 3: Number of command parameters */
        if (!strcmp("-d", argv[1])) {
-            /* netdebug sock -d <idx> */
-            idx = atoi(argv[2]);
+            idx = atoi(argv[2]); /* 2: netdebug sock -d <idx> */
            if (idx >= 0) {
                debug_socket_info(idx, 1, 1);
                ret = LOS_OK;
@@ -3796,8 +3794,9 @@ u32_t osShellIpDebug(int argc, const char **argv)
            PRINTK("%-50s ", acIPv6Addr);

            if (snprintf_s(aclladdr, sizeof(aclladdr), sizeof(aclladdr) - 1, "%02X:%02X:%02X:%02X:%02X:%02X",
-                           neighbor_cache[i].lladdr[0], neighbor_cache[i].lladdr[1], neighbor_cache[i].lladdr[2],
-                           neighbor_cache[i].lladdr[3], neighbor_cache[i].lladdr[4], neighbor_cache[i].lladdr[5]) < 0) {
+                           neighbor_cache[i].lladdr[0], neighbor_cache[i].lladdr[1], /* 0, 1, member number */
+                           neighbor_cache[i].lladdr[2], neighbor_cache[i].lladdr[3], /* 2, 3, member number */
+                           neighbor_cache[i].lladdr[4], neighbor_cache[i].lladdr[5]) < 0) { /* 4, 5, member number */
                return LOS_NOK;
            }
            PRINTK("%-25s ", aclladdr);
@@ -3884,4 +3883,4 @@ SHELLCMD_ENTRY(reboot_shellcmd, CMD_TYPE_EX, "reboot", XARGS, (CmdCallBackFunc)o
 #endif /* LOSCFG_SHELL_CMD_DEBUG */
 #endif

-#endif //LWIP_ENABLE_LOS_SHELL_CMD
+#endif // LWIP_ENABLE_LOS_SHELL_CMD
--- a/net/lwip-2.1/enhancement/src/dhcps.c
+++ b/net/lwip-2.1/enhancement/src/dhcps.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -435,9 +435,9 @@ LWIP_STATIC void handle_discover(struct netif *netif, struct dhcps *dhcps,
    }
 #else
    else {
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE,
-                  ("handle_discover: sendto(OFFER, IP_ADDR_BROADCAST, DHCP_CLIENT_PORT)\n"));
-      (void)udp_sendto_if_src(dhcps->pcb, out_msg, IP_ADDR_BROADCAST, DHCP_CLIENT_PORT, netif, &(netif->ip_addr));
+        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE,
+                    ("handle_discover: sendto(OFFER, IP_ADDR_BROADCAST, DHCP_CLIENT_PORT)\n"));
+        (void)udp_sendto_if_src(dhcps->pcb, out_msg, IP_ADDR_BROADCAST, DHCP_CLIENT_PORT, netif, &(netif->ip_addr));
    }
 #endif

@@ -601,7 +601,7 @@ LWIP_STATIC void handle_request(struct netif *netif, struct dhcps *dhcps, struct
        dhcp_common_option_byte(srvr_msg, DHCP_NAK, &options_len);

        /* Just set this here, so that the NAK message is brcasted.
-        The correct flags has already been added in the respose message during base message creation */
+        The correct flags has already been added in the response message during base message creation */
        client_msg->flags |= htons(DHCP_BROADCAST_FLAG);
        client_msg->ciaddr.addr = 0; /* This is done so that NAK Gets brcasted */
 #ifdef  LWIP_DEV_DEBUG
--- a/net/lwip-2.1/enhancement/src/fixme.c
+++ b/net/lwip-2.1/enhancement/src/fixme.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -412,7 +412,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
    int squash_pos = ipv6_blocks;
    int i;
    const char *s = cp;
-    const char *ss = cp-1;
+    const char *ss = cp - 1;

    for (; ; s++) {
        if (current_block_index >= ipv6_blocks) {
--- a/net/lwip-2.1/porting/include/arch/perf.h
+++ b/net/lwip-2.1/porting/include/arch/perf.h
@@ -34,8 +34,8 @@

 #if LWIP_PERF

-#define PERF_START    do {/* something to do */} while (0)
-#define PERF_STOP(x)  do {/* something to do */} while (0)
+#define PERF_START    do {} while (0) /* something to do */
+#define PERF_STOP(x)  do {} while (0) /* something to do */

 #endif

--- a/net/lwip-2.1/porting/src/driverif.c
+++ b/net/lwip-2.1/porting/src/driverif.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -98,10 +98,10 @@ driverif_output(struct netif *netif, struct pbuf *p)

 #if PF_PKT_SUPPORT
    if (all_pkt_raw_pcbs != NULL) {
-    p->flags = (u16_t)(p->flags & ~(PBUF_FLAG_LLMCAST | PBUF_FLAG_LLBCAST | PBUF_FLAG_HOST));
-    p->flags |= PBUF_FLAG_OUTGOING;
-    (void)raw_pkt_input(p, netif, NULL);
-  }
+        p->flags = (u16_t)(p->flags & ~(PBUF_FLAG_LLMCAST | PBUF_FLAG_LLBCAST | PBUF_FLAG_HOST));
+        p->flags |= PBUF_FLAG_OUTGOING;
+        (void)raw_pkt_input(p, netif, NULL);
+    }
 #endif

 #if ETH_PAD_SIZE
--- a/net/lwip-2.1/porting/src/sockets.c
+++ b/net/lwip-2.1/porting/src/sockets.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -803,12 +803,10 @@ static u8_t lwip_ioctl_internal_SIOCSIFHWADDR(struct ifreq *ifr)
    }
 #endif
    else {
-
        /* bring netif down to clear all Neighbor Cache Entry */
        (void)netif_set_down(netif);

        ret = netif_set_hwaddr(netif, (const unsigned char *)ifr->ifr_hwaddr.sa_data, netif->hwaddr_len);
-
        if (ret != ERR_OK) {
            (void)netif_set_up(netif);
            return err_to_errno(ret);
@@ -979,7 +977,6 @@ static u8_t lwip_ioctl_internal_SIOCGIFFLAGS(struct ifreq *ifr)
 #endif /* LWIP_IGMP || LWIP_IPV6_MLD */

 #if LWIP_DHCP
-        //if ((netif->flags & NETIF_FLAG_DHCP) != 0) {
        if (dhcp_supplied_address(netif)) {
            ifr->ifr_flags = (short)((unsigned short)ifr->ifr_flags | IFF_DYNAMIC);
        } else {
@@ -1090,7 +1087,6 @@ static u8_t lwip_ioctl_internal_SIOCSIFNAME(struct ifreq *ifr)
 #endif

    netif = netif_find(ifr->ifr_name);
-
    if (netif == NULL) {
        return ENODEV;
    } else if (netif->link_layer_type == LOOPBACK_IF) {
@@ -1165,7 +1161,6 @@ static u8_t lwip_ioctl_internal_SIOCGIFMTU(struct ifreq *ifr)

    /* get netif hw addr */
    netif = netif_find(ifr->ifr_name);
-
    if (netif == NULL) {
        return ENODEV;
    } else {
--- a/security/vid/vid.c
+++ b/security/vid/vid.c
@@ -116,8 +116,8 @@ static UINT16 GetFreeVid(VOID)
    for (i = 0; i < mapMaxNum; i++) {
        num = idMap->bitMap[i];
        for (j = 0; j < INT_BIT_COUNT; j++) {
-            if ((num & (1 << j)) == 0) {
-                num |= 1 << j;
+            if ((num & (1U << j)) == 0) {
+                num |= 1U << j;
                idMap->bitMap[i] = num;
                return (INT_BIT_COUNT * i + j);
            }
@@ -160,7 +160,7 @@ static VOID ReleaseVid(UINT16 vid)
    a = vid >> INT_BIT_SHIFT;
    b = vid & (INT_BIT_COUNT - 1);

-    idMap->bitMap[a] &= ~(1 << b);
+    idMap->bitMap[a] &= ~(1U << b);

    /* shrink bit map */
    if (mapMaxNum > 1) {
--- a/security/vid/vid_api.h
+++ b/security/vid/vid_api.h
@@ -34,9 +34,9 @@
 #include "los_typedef.h"
 #include "los_process_pri.h"

-#define INT_BIT_COUNT 32
-#define INT_BIT_SHIFT 5
-#define VID_MAP_MAX_NUM 32
+#define INT_BIT_COUNT 32U
+#define INT_BIT_SHIFT 5U
+#define VID_MAP_MAX_NUM 32U

 #define MAX_INVALID_TIMER_VID (VID_MAP_MAX_NUM * INT_BIT_COUNT)

--- a/shell/full/src/base/shell_lk.c
+++ b/shell/full/src/base/shell_lk.c
@@ -145,7 +145,7 @@ INT32 CmdLog(INT32 argc, const CHAR **argv)
        }
    } else if (!strncmp(argv[0], "module", strlen(argv[0]) + 1)) {
        module = strtoul(argv[1], &p, 0);
-        if ((*p != 0) || (module > MODULE4) || (module < MODULE0)) {
+        if ((*p != 0) || (module > MODULE4)) {
            PRINTK("log %s can't access %s\n", argv[0], argv[1]);
            PRINTK("not support yet\n");
            return -1;
--- a/shell/full/src/base/shmsg.c
+++ b/shell/full/src/base/shmsg.c
@@ -329,7 +329,7 @@ END:
 LITE_OS_SEC_TEXT_MINOR UINT32 ShellEntry(UINTPTR param)
 {
    CHAR ch;
-    INT32 n = 0;
+    INT32 n;
    ShellCB *shellCB = (ShellCB *)param;

    CONSOLE_CB *consoleCB = OsGetConsoleByID((INT32)shellCB->consoleID);
--- a/shell/full/src/cmds/dmesg.c
+++ b/shell/full/src/cmds/dmesg.c
@@ -425,7 +425,7 @@ STATIC VOID OsBufFullWrite(const CHAR *dst, UINT32 logLen)

 STATIC VOID OsWriteTailToHead(const CHAR *dst, UINT32 logLen)
 {
-    UINT32 writeLen = 0;
+    UINT32 writeLen;
    UINT32 bufSize = g_logBufSize;
    UINT32 logSize = g_dmesgInfo->logSize;
    UINT32 tail = g_dmesgInfo->logTail;
--- a/syscall/syscall_lookup.h
+++ b/syscall/syscall_lookup.h
@@ -263,7 +263,7 @@ SYSCALL_HAND_DEF(__NR_statx, SysStatx, int, ARG_NUM_5)
 SYSCALL_HAND_DEF(__NR_pthread_set_detach, SysUserThreadSetDetach, int, ARG_NUM_1)
 SYSCALL_HAND_DEF(__NR_pthread_join, SysThreadJoin, int, ARG_NUM_1)
 SYSCALL_HAND_DEF(__NR_pthread_deatch, SysUserThreadDetach, int, ARG_NUM_1)
-SYSCALL_HAND_DEF(__NR_creat_user_thread, SysCreateUserThread, unsigned int, ARG_NUM_3)
+SYSCALL_HAND_DEF(__NR_create_user_thread, SysCreateUserThread, unsigned int, ARG_NUM_3)
 SYSCALL_HAND_DEF(__NR_getrusage, SysGetrusage, int, ARG_NUM_2)
 SYSCALL_HAND_DEF(__NR_sysconf, SysSysconf, long, ARG_NUM_1)
 SYSCALL_HAND_DEF(__NR_ugetrlimit, SysUgetrlimit, int, ARG_NUM_2)
--- a/syscall/syscall_pub.c
+++ b/syscall/syscall_pub.c
@@ -83,6 +83,10 @@ int GetFullpath(int fd, const char *path, char **fullpath)
            fd = GetAssociatedSystemFd(fd);
        }
        ret = fs_getfilep(fd, &file);
+        if (ret < 0) {
+            ret = -EPERM;
+            goto OUT;
+        }
        if (file) {
            ret = stat(file->f_path, &bufRet);
            if (!ret) {
--- a/syscall/time_syscall.c
+++ b/syscall/time_syscall.c
@@ -109,7 +109,7 @@ int SysSetiTimer(int which, const struct itimerval *value, struct itimerval *ova
 {
    int ret;
    struct itimerval svalue;
-    struct itimerval sovalue;
+    struct itimerval sovalue = { 0 };

    if (value == NULL) {
        errno = EINVAL;
@@ -137,7 +137,7 @@ int SysSetiTimer(int which, const struct itimerval *value, struct itimerval *ova
 int SysGetiTimer(int which, struct itimerval *value)
 {
    int ret;
-    struct itimerval svalue;
+    struct itimerval svalue = { 0 };

    if (value == NULL) {
        errno = EINVAL;
@@ -189,7 +189,7 @@ int SysTimerCreate(clockid_t clockID, struct ksigevent *evp, timer_t *timerID)
 int SysTimerGettime(timer_t timerID, struct itimerspec *value)
 {
    int ret;
-    struct itimerspec svalue;
+    struct itimerspec svalue = { 0 };

    if (value == NULL) {
        errno = EINVAL;
@@ -213,7 +213,7 @@ int SysTimerSettime(timer_t timerID, int flags, const struct itimerspec *value,
 {
    int ret;
    struct itimerspec svalue;
-    struct itimerspec soldValue;
+    struct itimerspec soldValue = { 0 };

    if (value == NULL) {
        errno = EINVAL;
@@ -285,7 +285,7 @@ int SysClockSettime(clockid_t clockID, const struct timespec *tp)
 int SysClockGettime(clockid_t clockID, struct timespec *tp)
 {
    int ret;
-    struct timespec stp;
+    struct timespec stp = { 0 };

    if (tp == NULL) {
        errno = EINVAL;
@@ -308,7 +308,7 @@ int SysClockGettime(clockid_t clockID, struct timespec *tp)
 int SysClockGetres(clockid_t clockID, struct timespec *tp)
 {
    int ret;
-    struct timespec stp;
+    struct timespec stp = { 0 };

    if (tp == NULL) {
        errno = EINVAL;
@@ -356,7 +356,7 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
    int ret;
    struct timespec srqtp;
-    struct timespec srmtp;
+    struct timespec srmtp = { 0 };

    if (!rqtp || LOS_ArchCopyFromUser(&srqtp, rqtp, sizeof(struct timespec))) {
        errno = EFAULT;
@@ -384,7 +384,7 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp)
 clock_t SysTimes(struct tms *buf)
 {
    clock_t ret;
-    struct tms sbuf;
+    struct tms sbuf = { 0 };

    if (buf == NULL) {
        errno = EFAULT;
@@ -436,7 +436,7 @@ int SysClockGettime64(clockid_t clockID, struct timespec64 *tp)
 {
    int ret;
    struct timespec t;
-    struct timespec64 stp;
+    struct timespec64 stp = { 0 };

    if (tp == NULL) {
        errno = EINVAL;
@@ -463,7 +463,7 @@ int SysClockGetres64(clockid_t clockID, struct timespec64 *tp)
 {
    int ret;
    struct timespec t;
-    struct timespec64 stp;
+    struct timespec64 stp = { 0 };

    if (tp == NULL) {
        errno = EINVAL;
@@ -525,7 +525,7 @@ int SysTimerGettime64(timer_t timerID, struct itimerspec64 *value)
 {
    int ret;
    struct itimerspec val;
-    struct itimerspec64 svalue;
+    struct itimerspec64 svalue = { 0 };

    if (value == NULL) {
        errno = EINVAL;
@@ -584,6 +584,7 @@ int SysTimerSettime64(timer_t timerID, int flags, const struct itimerspec64 *val
    }

    if (oldValue != NULL) {
+        (void)memset_s(&soldValue, sizeof(struct itimerspec64), 0, sizeof(struct itimerspec64));
        soldValue.it_interval.tv_sec = oldVal.it_interval.tv_sec;
        soldValue.it_interval.tv_nsec = oldVal.it_interval.tv_nsec;
        soldValue.it_value.tv_sec = oldVal.it_value.tv_sec;
--- a/testsuites/kernel/include/osTest.h
+++ b/testsuites/kernel/include/osTest.h
@@ -86,14 +86,14 @@ extern "C" {
 #endif /* __cpluscplus */
 #endif /* __cpluscplus */

-#define TEST_TASK_PARAM_INIT(testTask, task_name, entry, prio)     \
-    do {                                                           \
-        memset(&testTask, 0, sizeof(TSK_INIT_PARAM_S));            \
-        testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry;             \
-        testTask.uwStackSize = 0x1000;                             \
-        testTask.pcName = task_name;                               \
-        testTask.usTaskPrio = prio;                                \
-        testTask.uwResved = LOS_TASK_STATUS_DETACHED;              \
+#define TEST_TASK_PARAM_INIT(testTask, task_name, entry, prio)                              \
+    do {                                                                                    \
+        (void)memset_s(&(testTask), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); \
+        testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry;                                      \
+        testTask.uwStackSize = 0x1000;                                                      \
+        testTask.pcName = task_name;                                                        \
+        testTask.usTaskPrio = prio;                                                         \
+        testTask.uwResved = LOS_TASK_STATUS_DETACHED;                                       \
    } while (0);

 #ifdef LOSCFG_KERNEL_SMP
--- a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c
+++ b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c
@@ -50,7 +50,7 @@ VOID RecordIntrTrace(INT32 irq, INT32 direction)
 VOID ResetIntrTrace(VOID)
 {
    g_traceIdx = 0;
-    memset(g_intrTrace, 0, RECORD_SIZE);
+    (void)memset_s(g_intrTrace, RECORD_SIZE, 0, RECORD_SIZE);
 }

 UINT32 CheckIntrTrace(UINT32 *expect, UINT32 num)
--- a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c
+++ b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c
@@ -44,7 +44,7 @@ static VOID NestingPrioHigh(INT32 irq, VOID *data)
 {
    g_intrHandleEnd = 1;
    UINT32 temp[0x100][2] = {0};
-    memset(temp, 1, sizeof(UINT32) * 0x100 * 2); // 2, buffer size.
+    (void)memset_s(temp, sizeof(UINT32) * 0x100 * 2, 1, sizeof(UINT32) * 0x100 * 2); // 2, buffer size.
 }

 static VOID TaskF01(VOID)
--- a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_007.c
+++ b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_007.c
@@ -49,13 +49,13 @@ static VOID NestingPrioHigh(INT32 irq, VOID *data)
    UINT64 curTime;
    curTime = LOS_CurrNanosec();
    g_recordTime[g_saveIndex] = curTime - g_intPendTime;
-    if (g_saveIndex == MAX_RECORD_SIZE) {
-        g_saveIndex = 0;
-    }
    dprintf("curTime = %lld, pendTime = %lld \n", curTime, g_intPendTime);
    dprintf("%lld\n", curTime - g_intPendTime);
    dprintf("[swtmr] hwi response time : ##%lld \n", g_recordTime[g_saveIndex]);
    g_saveIndex++;
+    if (g_saveIndex == MAX_RECORD_SIZE) {
+        g_saveIndex = 0;
+    }
 }

 static VOID DumpResult()
--- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c
@@ -58,7 +58,7 @@ static UINT32 Testcase(void)
    // 32, number of cycles
    for (index = 0; index < 32; index++) {
        task1.usTaskPrio = index;
-        snprintf(acName, 10, "Tsk040A%2d", index); // 10, snprintf size.
+        (void)snprintf_s(acName, TASK_NAME_NUM, TASK_NAME_NUM - 1, "Tsk040A%2d", index);
        task1.pcName = acName;
        task1.uwResved = LOS_TASK_STATUS_DETACHED;

--- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c
@@ -58,9 +58,10 @@ EXIT:
 static UINT32 Testcase(void)
 {
    UINT32 ret;
-    TSK_INIT_PARAM_S task1;
+    TSK_INIT_PARAM_S task1 = {0};
+
    LOS_EventInit(&g_eventCb01);
-    memset(&task1, 0, sizeof(TSK_INIT_PARAM_S));
+
    task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
    task1.pcName = "Tsk082A";
    task1.uwStackSize = TASK_STACK_SIZE_TEST;
--- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c
@@ -142,7 +142,8 @@ static UINT32 Testcase(void)
    ret = LOS_TaskCreate(&g_testTaskID01, &task1);
    ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

-    memset(&task1, 0, sizeof(TSK_INIT_PARAM_S));
+    ret = memset_s(&task1, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
    task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
    task1.uwStackSize = TASK_STACK_SIZE_TEST;
    task1.pcName = "Tsk118B";
--- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c
@@ -142,7 +142,8 @@ static UINT32 Testcase(void)
    ret = LOS_TaskCreate(&g_testTaskID01, &task1);
    ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

-    memset(&task1, 0, sizeof(TSK_INIT_PARAM_S));
+    ret = memset_s(&task1, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
    task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
    task1.uwStackSize = TASK_STACK_SIZE_TEST;
    task1.pcName = "Tsk118B";
--- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c
@@ -80,7 +80,8 @@ static UINT32 Testcase(void)
    currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM;
 #endif

-    memset(&task, 0, sizeof(TSK_INIT_PARAM_S));
+    ret = memset_s(&task, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
+    ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
    task.pfnTaskEntry = (TSK_ENTRY_FUNC)ItTimeslice001F01;
    task.usTaskPrio = TASK_PRIO_TEST_TASK + 1;
    task.pcName = "it_timeslice_001_f01";
--- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c
+++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c
@@ -99,7 +99,8 @@ static UINT32 Testcase(void)
    currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM;
 #endif

-    memset(&task, 0, sizeof(TSK_INIT_PARAM_S));
+    ret = memset_s(&task, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
    task.pfnTaskEntry = (TSK_ENTRY_FUNC)ItTimeslice002F01;
    task.usTaskPrio = TASK_PRIO_TEST_TASK + 1;
    task.pcName = "it_timeslice_002_f01";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openharmony_ci	2bef65046a	!1081 fix: 【挑单】codecheck问题清零 Merge pull request !1081 from zhushengle/cherry-pick-1669685670	2022-11-29 03:20:11 +00:00
zhushengle	205df75f15	fixed `8d980de` from https://gitee.com/zhushengle/kernel_liteos_a/pulls/1078 fix: codecheck问题清零 1.shell初始化异常流程double free 2.los_disk_init中冗余初始化 3.OsKProcessPmUsage 中OsUProcessPmUsage异常退出时，存在使用未初始化的变量 4.HiLogHeadInit异常推出后，存在使用未初始化的变量 5.api_shell.c 中存在冗余初始化 fix #I63H5G Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: If17d8ed1e6f2276e20fbce24b32de169bfd22e54	2022-11-29 01:34:30 +00:00
openharmony_ci	85f1c9e0ca	!1067 【挑单】time相关系统调用内核栈信息泄露排查 Merge pull request !1067 from zhushengle/cherry-pick-1668158211	2022-11-14 03:24:57 +00:00
zhushengle	c04ff6b10f	fixed `0b05a46` from https://gitee.com/zhushengle/kernel_liteos_a/pulls/1061 task: time相关系统调用内核栈信息泄露排查解决方案: 在涉及从内核拷贝数据到用户态的场景时，先将内核的数据进行清零操作，再填充内核数据 Close #I60M1P Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: Ia61d4e39b9e190accea477ff5b361e41d0eed2af	2022-11-11 09:16:52 +00:00
openharmony_ci	1b61489512	!1048 Fix : 内核告警清理挑单到monthly 分支 Merge pull request !1048 from yinjiaming/cherry-pick-1666774395	2022-10-27 14:24:41 +00:00
yinjiaming	29c459e045	fixed `8d55bb1` from https://gitee.com/hgbveiu743/kernel_liteos_a/pulls/1046 fix: 内核告警清理【背景】内核告警清理【修改方案】删去了多余的空格，更改了魔数字【影响】对现有的产品编译不会有影响。 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Iba21be6cb23027dfb369576847d7d21e85f936b4	2022-10-26 08:53:15 +00:00
openharmony_ci	e7daa28200	!1025 清除一些静态检查工具发现的问题 Merge pull request !1025 from Far/master	2022-10-17 01:39:02 +00:00
Far	987a722d2d	fix: 修复一些静态检查工具发现的问题 Signed-off-by: Far <yesiyuan2@huawei.com> Change-Id: I2b93259d55a9eb1a9dfd5887fd7821c15274bb7f	2022-10-15 17:36:45 +08:00
openharmony_ci	ccdfa72431	!1016 修复执行测试用例执行时间过长等问题 Merge pull request !1016 from 夏不白/fix_unittest	2022-10-12 06:29:16 +00:00
openharmony_ci	557a71c1c3	!1020 jffs2.patch 文件适配LTS补丁升级 Merge pull request !1020 from 闻飞/master	2022-10-08 11:28:25 +00:00
wenfei	569aecb6ea	jffs2.patch update Signed-off-by: wenfei <wenfei9@huawei.com>	2022-09-30 11:23:29 +08:00
xiacong	8c0b7d0f38	<fix> 修复测试用例不过的问题 <body> 1.修复执行liteos_a_basic_unittest.bin时间过长的问题 2.修复测试shm系列系统调用函数用例失败的问题 Signed-off-by: xiacong <xiacong4@huawei.com> Change-Id: Iabc541cb1c0e97dac0fe13aaeb98e85404e5bf6f Signed-off-by: xiacong <xiacong4@huawei.com>	2022-09-28 17:24:14 +08:00
openharmony_ci	c488817b32	!1008 修复内核告警信息 Merge pull request !1008 from zhangdengyu/fix_preferused	2022-09-26 12:52:00 +00:00
openharmony_ci	43d47a27e3	!1011 fix: 修复shell_lk.c告警清零带来的逻辑修改 Merge pull request !1011 from 夏不白/module_fix	2022-09-26 11:22:57 +00:00
xiacong	a83f916298	<fix> 恢复告警清零带来的逻辑改变 Signed-off-by: xiacong <xiacong4@huawei.com> Change-Id: I8d34d2b9c43ea54e5474cbddcde0048658cbb891 Signed-off-by: xiacong <xiacong4@huawei.com>	2022-09-26 17:29:08 +08:00
zhangdengyu	8dbfd3846e	fix: 修复告警 Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>	2022-09-26 17:08:56 +08:00
openharmony_ci	f34762c105	!1001 修复函数返回错误等问题 Merge pull request !1001 from zhangdengyu/fix_tsacn	2022-09-25 06:42:18 +00:00
zhangdengyu	043e84dfcb	fix：修复函数返回错误等问题 Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>	2022-09-25 10:09:29 +08:00
openharmony_ci	453c376198	!997 Fix : 内核告警清理 Merge pull request !997 from yinjiaming/fix	2022-09-22 11:33:00 +00:00
yinjiaming	204d7a4abb	fix: 内核告警清理【背景】内核中经扫描有可以修改的告警之处【修改方案】优化了代码的格式【影响】对现有的产品编译不会有影响。 re #I5SHM2 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I89be86a8317637f9eb54257131712b5b79f1e454	2022-09-22 16:53:11 +08:00
openharmony_ci	f2861a84bf	!987 Fix : 内核告警清理 Merge pull request !987 from yinjiaming/fix	2022-09-21 04:42:42 +00:00
yinjiaming	96b2d557ac	fix: 内核告警修复【背景】经代码扫描工具检测,内核代码中存在可以修复的告警【修改方案】 1.将单语句的if, while等加上括号 2.将C语言风格的类型转换变为C++风格【影响】对现有的产品编译不会有影响。 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I7d4a04a8904abb3c33e843049bf15f4386d3efd8	2022-09-21 11:38:51 +08:00
openharmony_ci	ffa11535ca	!991 【OpenHarmony开源贡献者计划2022】fix warning: expression result unused Merge pull request !991 from xiwen1225/void	2022-09-19 03:19:16 +00:00
openharmony_ci	b581207045	!992 【OpenHarmony开源贡献者计划2022】fix warning for signal_test_016.cpp Merge pull request !992 from queuechen/warn	2022-09-19 02:44:00 +00:00
ookami78	5105249ecf	fix warning for signal_test_016.cpp Signed-off-by: ookami78 <ookami78@mymailcr.com>	2022-09-18 14:21:46 +08:00
cunwen	a61e2cf16e	fix warning: expression result unused Signed-off-by: cunwen <cunwen181168@liuxiuhai.cn>	2022-09-18 11:29:44 +08:00
openharmony_ci	39e25c5220	!989 Fix : 修复测试用例返回值问题 Merge pull request !989 from yinjiaming/dev	2022-09-13 12:38:03 +00:00
yinjiaming	5541965365	fix: 修复测试用例中函数返回值的问题【背景】测试用例中有函数的返回值不正确【修改方案】将返回值为VOID *的函数的返回值改为 retrun NULL 【影响】对现有的产品编译不会有影响。 re #I5O3LH Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I6d3ce9efbe9afe14b1e9dd12538b80e69928fd71	2022-09-09 15:28:22 +08:00
openharmony_ci	edd2223083	!983 【OpenHarmony开源贡献者计划2022】删除未使用的变量 count Merge pull request !983 from leijiawei/master	2022-09-06 06:20:52 +00:00
openharmony_ci	22392965b5	!947 Fix : 版权头时间更新 Merge pull request !947 from yinjiaming/dev	2022-09-06 02:55:30 +00:00
yinjiaming	d906bb91ea	fix: 版权头时间更新问题【背景】一些代码文件经过修改后需要更新版权头【修改方案】更新了需要更新的版权头时间【影响】对现有的产品编译不会有影响。 re #I5LG22 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I7963bf6ce5746707bad688dd4c634ae9d72b3c04	2022-09-05 16:03:30 +08:00
leijiawei	51f6a20723	fix warning:unused variable 'count' & add return value Signed-off-by: leijiawei <18691361562@163.com>	2022-08-31 15:28:27 +08:00
leibanli	325ea29df3	fix warning:unused variable 'count' Signed-off-by: leijiawei <18691361562@163.com>	2022-08-31 15:01:32 +08:00
leibanli	c2f9f6705f	【openHarmony开源贡献者计划2022】18691361562@163.com Signed-off-by: leibanli <18691361562@163.com>	2022-08-30 21:53:58 +08:00
openharmony_ci	71e51d8813	!971 非安全函数告警清理 Merge pull request !971 from xuxinyu/function_s	2022-08-26 04:45:29 +00:00
xuxinyu	e0b4fcb23d	test: replace unsecure function with secure function Signed-off-by: xuxinyu <xuxinyu6@huawei.com> Change-Id: Ie120ffa529798f0f087ddfcd34f5d9c5802b6766	2022-08-25 23:08:58 +08:00
openharmony_ci	7d62d3d62b	!979 style: shell脚本中不同函数使用不同变量 Merge pull request !979 from Hongjin Li/dev	2022-08-25 03:32:45 +00:00
Hongjin Li	69f3bf3a2a	style: using different variable in different functions Signed-off-by: Hongjin Li <lihongjin1@huawei.com> Change-Id: I814dcccefcd6248ea32cae94bfde567f3077c7cd	2022-08-25 10:16:45 +08:00
openharmony_ci	2590e34346	!969 编译构建规范优化 Merge pull request !969 from Hongjin Li/dev	2022-08-23 12:55:42 +00:00
Hongjin Li	660b314f90	style: string format in python Signed-off-by: Hongjin Li <lihongjin1@huawei.com> Change-Id: Ie84a97ca5e0250991aa774b737eb7787e27d80af	2022-08-23 20:22:13 +08:00
openharmony_ci	44ec199465	!951 【OpenHarmony开源贡献者计划2022】fix moudule to module Merge pull request !951 from bingge88/module	2022-08-12 02:16:38 +00:00
openharmony_ci	7437408f65	!950 OpenHarmony开源贡献者计划2022】fix: change szie to size Merge pull request !950 from Dream_Liu/master	2022-08-12 02:15:42 +00:00
binge889	1134332a58	fix moudule to module Signed-off-by: binge889 <binge889@liuxiuhai.cn>	2022-08-11 23:31:52 +08:00
Dream_Liu	8099f6578d	fix:change szie to size Signed-off-by: Dream_Liu <lxm201x@163.com>	2022-08-11 23:14:20 +08:00
openharmony_ci	ba23a26f95	!928 Fix : 内核告警清理 Merge pull request !928 from yinjiaming/fix	2022-08-09 08:37:34 +00:00
yinjiaming	2dc24da826	fix: 内核告警清理【背景】内核代码经代码扫描工具发现存在一些关于代码格式的告警，现经修改解除掉告警. 【修改方案】修改了代码中格式不规范的地方，修改的点有： 1.代码中一行过长 2.没有合理的添加空格和空行 3.没有按照规范进行缩进 4.括号的格式没有按照规范 5.注释的格式不对以及存在魔数字 6.函数的声明与定义的格式不一致并更新了修改文件的版权头时间【影响】对现有的产品编译不会有影响。 re #I5H6F5 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Ie46b5b3238fd88c25f99542b8ccd138b956c6458	2022-08-08 13:09:54 +00:00
openharmony_ci	6302c5f767	!938 修复用例告警 Merge pull request !938 from xuxinyu/master	2022-07-29 03:46:59 +00:00
xuxinyu	f0d5959576	fix: 修复用例告警问题 re #I5I21P Signed-off-by: xuxinyu <xuxinyu6@huawei.com> Change-Id: Iedab5b6fddafc2042c7fd23fbcd82061629f87d8	2022-07-26 11:07:02 +08:00
openharmony_ci	65790b67d5	!937 拼写错误修正 Merge pull request !937 from yinjiaming/dev	2022-07-25 11:06:35 +00:00
openharmony_ci	9eff5cff1d	!934 refactor: sysroot部件化 Merge pull request !934 from Zhaotianyu/20220716sysroot_lite	2022-07-22 08:57:25 +00:00
yinjiaming	99ea8d4ed2	fix: 拼写错误修正【背景】代码中存在拼写错误【修改方案】修改存在拼写错误的地方【影响】对现有的产品编译不会有影响。 re #I5IA7P Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Idd5d7fc9705e5ec661596aa6533402e8d4a8a117	2022-07-21 11:05:11 +00:00
arvinzzz	1568c317bb	refactor: sysroot部件化 close: #I5HF8S Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: I727b10c3b419fc71e228f5ad92abc107e756bbac	2022-07-19 12:32:32 +08:00
openharmony_ci	5e70129199	!917 【OpenHarmony开源贡献者计划2022】fix warning: unused variable Merge pull request !917 from rtos_ming/unused	2022-07-04 01:24:28 +00:00
zhumingxian	089376994a	fix warning: unused variable Signed-off-by: zhumingxian <zhumingxian@ohos.com.cn>	2022-06-30 20:49:50 +08:00
openharmony_ci	12adfd5832	!915 【OpenHarmony开源贡献者计划2022】Fixed typos. Merge pull request !915 from Mr_YX/master	2022-06-30 06:11:01 +00:00
openharmony_ci	c46c5a640d	!905 「OpenHarmony贡献者计划2022」update signal_test_020.cpp Merge pull request !905 from Mr_YX/master	2022-06-30 06:09:18 +00:00
mr-yx	c812b0c27b	fixed typos Signed-off-by: mr-yx <496043997@qq.com>	2022-06-28 23:48:24 +08:00
openharmony_ci	51528ec39c	!906 【OpenHarmony开源贡献者计划2022】Optimized conversion instructions. Merge pull request !906 from Mr_YX/master	2022-06-27 09:31:08 +00:00
openharmony_ci	beb03bfc81	!903 【OpenHarmony开源贡献者计划2022】fix typos for net Merge pull request !903 from c01dface/master	2022-06-23 14:54:42 +00:00
openharmony_ci	bbbd96784e	!904 修复liteos_a仓库中存在的一些拼写错误 Merge pull request !904 from Hongjin Li/dev	2022-06-23 04:15:03 +00:00
lihongjin	1c0de289ec	style: Misspelling Signed-off-by: lihongjin <lihongjin1@huawei.com> Change-Id: I13163f2e4d1e4b6e6c6bedaf9d4e705544df926b	2022-06-23 09:45:46 +08:00
openharmony_ci	a3d757c8e1	!898 【轻量级 PR】：「OpenHarmony开源贡献者计划2022」update testsuites/unittest/libc/util/smoke/util_test_005.cpp. Merge pull request !898 from Mr_YX/N/A	2022-06-23 01:02:42 +00:00
openharmony_ci	6fede4eb92	!892 【OpenHarmony开源贡献者计划2022】更新readme中的目录结构 Merge pull request !892 from wanggang/master	2022-06-23 00:43:57 +00:00
Mr_YX	7be302633f	Signed-off-by: mr-yx <496043997@qq.com>	2022-06-20 18:08:19 +00:00
Mr_YX	0164461b33	Signed-off-by: mr-yx <496043997@qq.com>	2022-06-20 15:16:02 +00:00
Neil Chen	9bb4be5e13	fix typos for net Signed-off-by: Neil Chen <jingsi.chen@petalmail.com>	2022-06-19 14:10:19 +08:00
openharmony_ci	4acf1e9f8d	!896 feat: normalize drivers framework component and repos Merge pull request !896 from yuanbo/master	2022-06-17 06:39:48 +00:00
openharmony_ci	870221452d	!900 【轻量级 PR】：remove tzdriver Kconfig Merge pull request !900 from WoolenSky/N/A	2022-06-17 03:16:48 +00:00
WoolenSky	30c3fb086e	remove tzdriver Kconfig Signed-off-by: YuanHao<yuanhao34@huawei.com>	2022-06-16 11:59:28 +00:00
Mr_YX	9b1e0a186b	update testsuites/unittest/libc/util/smoke/util_test_005.cpp. Signed-off-by: mr-yx <496043997@qq.com>	2022-06-15 14:05:19 +00:00
yuanbo	00dbf1e5d5	feat: normalize drivers framework component and repos Signed-off-by: yuanbo <yuanbo@huawei.com>	2022-06-15 20:02:05 +08:00
openharmony_ci	16fdbdf650	!885 【OpenHarmony开源贡献者计划2022】代码打印中sucess修改为success Merge pull request !885 from lingxin_2019/master	2022-06-14 01:57:54 +00:00
wanggang	9fb176b827	update readme Signed-off-by: wanggang <wanggang@kaihongdigi.com>	2022-06-10 10:11:17 +08:00
lingxin_2019	0b9cac2cd3	Signed-off-by: 贺婷婷 <596256905@qq.com>	2022-05-26 08:09:56 +00:00
lingxin_2019	9958f647f5	Signed-off-by: 贺婷婷 <596256905@qq.com>	2022-05-26 12:24:46 +08:00