!840 fix: 修复內源检视问题

Merge pull request !840 from zhushengle/xxx

apps/perf/src/main.c

@@ -63,9 +63,12 @@ int main(int argc, char **argv)
     } else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) {
         size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0);
         char *buf = (char *)malloc(size);
-        int len = PerfRead(fd, buf, size);
-        PerfPrintBuffer(buf, len);
-        free(buf);
+        if (buf != NULL) {
+            int len = PerfRead(fd, buf, size);
+            PerfPrintBuffer(buf, len);
+            free(buf);
+            buf = NULL;
+        }
     } else if ((argc == TWO_ARGS) && strcmp(argv[1], "list") == 0) {
         PerfList();
     } else if ((argc >= THREE_ARGS) && strcmp(argv[1], "stat") == 0) {

kernel/common/los_config.c

@@ -183,7 +183,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsSystemInfo(VOID)
                   KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, buildType);
 }
 
-LITE_OS_SEC_TEXT_INIT INT32 OsMain(VOID)
+LITE_OS_SEC_TEXT_INIT UINT32 OsMain(VOID)
 {
     UINT32 ret;
 #ifdef LOS_INIT_STATISTICS

kernel/common/los_config.h

@@ -453,7 +453,7 @@ typedef VOID (*log_read_write_fn)(UINT32 startAddr, UINT32 space, UINT32 rwFlag,
 VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_write_fn hook);
 #endif
 
-extern INT32 OsMain(VOID);
+extern UINT32 OsMain(VOID);
 
 typedef VOID (*SystemRebootFunc)(VOID);
 VOID OsSetRebootHook(SystemRebootFunc func);

kernel/common/main.c

@@ -34,11 +34,9 @@
 
 LITE_OS_SEC_TEXT_INIT INT32 main(VOID)
 {
-    UINT32 uwRet;
-
-    uwRet = OsMain();
-    if (uwRet != LOS_OK) {
-        return LOS_NOK;
+    UINT32 ret = OsMain();
+    if (ret != LOS_OK) {
+        return (INT32)LOS_NOK;
     }
     CPU_MAP_SET(0, OsHwIDGet());
 

kernel/extended/trace/pipeline/trace_pipeline.c

@@ -132,7 +132,7 @@ VOID OsTraceDataSend(UINT8 type, UINT16 len, UINT8 *data)
     UINT32 intSave;
     UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0};
 
-    if ((type > TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) {
+    if ((type >= TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) {
         return;
     }