Merge branch 'master' of gitee.com:openharmony/startup_init_lite into fixbug

Signed-off-by: Nxionglei <xionglei6@huawei.com>

device_info/device_info_kits.cpp

@@ -129,7 +129,8 @@ const char *AclGetSerial(void)
     OHOS::device_info::DeviceInfoKits &instance = OHOS::device_info::DeviceInfoKits::GetInstance();
     int ret = instance.GetSerialID(result);
     if (ret == 0) {
-        (void)strcpy_s(serialNumber, sizeof(serialNumber), result.c_str());
+        ret = strcpy_s(serialNumber, sizeof(serialNumber), result.c_str());
+        DINFO_CHECK(ret == 0, return nullptr, "Failed to copy");
     }
     DINFO_LOGI("GetSerial %s", serialNumber);
     return serialNumber;

interfaces/innerkits/sandbox/sandbox.c

@@ -298,7 +298,7 @@ static void InitSandbox(sandbox_t *sandbox, const char *sandboxConfig, const cha
         return;
     }
     if (sandbox->isCreated) {
-        BEGET_LOGE("Sandbox %s has created.");
+        BEGET_LOGE("Sandbox %s has created.", name);
         return;
     }
     if (UnshareNamespace(CLONE_NEWNS) < 0) {

interfaces/innerkits/sandbox/system-sandbox.json

@@ -24,6 +24,10 @@
             "src-path" : "/system/fonts",
             "sandbox-path" : "/system/fonts",
             "sandbox-flags" : [ "bind", "rec", "private" ]
+        }, {
+            "src-path" : "/system/usr",
+            "sandbox-path" : "/system/usr",
+            "sandbox-flags" : [ "bind", "rec", "private" ]
         }, {
             "src-path" : "/vendor",
             "sandbox-path" : "/vendor",
@@ -56,6 +60,10 @@
             "src-path" : "/storage",
             "sandbox-path" : "/storage",
             "sandbox-flags" : [ "bind", "rec", "private" ]
+        }, {
+            "src-path" : "/sys_prod",
+            "sandbox-path" : "/sys_prod",
+            "sandbox-flags" : [ "bind", "rec", "private" ]
         }
     ],
     "mount-bind-files" : [{
@@ -71,4 +79,4 @@
             "link-name" : "/etc"
         }
     ]
-}
\ No newline at end of file
+}

interfaces/innerkits/service_control/service_control.c

@@ -221,7 +221,7 @@ int ServiceSetReady(const char *serviceName)
         BEGET_LOGE("Set param for %s failed.", paramName);
         return -1;
     }
-    BEGET_LOGI("Success set %d read", serviceName);
+    BEGET_LOGI("Success set %s read", serviceName);
     return 0;
 }
 

services/begetctl/main.c

@@ -65,7 +65,9 @@ int main(int argc, char *argv[])
         args = argv + 1;
     }
     if (number >= 1 && strcmp(args[0], "devctl") == 0) {
-        (void)memcpy_s(args[0], strlen(args[0]), "reboot", strlen("reboot"));
+        if (memcpy_s(args[0], strlen(args[0]), "reboot", strlen("reboot")) != 0) {
+            printf("Failed to copy\n");
+        }
     }
     SetInitLogLevel(0);
     BShellParamCmdRegister(g_handle, 0);

services/begetctl/misc_daemon.cpp

@@ -81,13 +81,13 @@ static void WriteLogoContent(int fd, const std::string &logoPath, uint32_t size)
         (void)fclose(rgbFile);
         return;
     }
-    uint32_t ret = fread(buffer, 1, size, rgbFile);
-    if (ret < 0) {
+    (void)fread(buffer, 1, size, rgbFile);
+    if (ferror(rgbFile)) {
         (void)fclose(rgbFile);
         free(buffer);
         return;
     }
-    ret = write(fd, buffer, size);
+    uint32_t ret = write(fd, buffer, size);
     if (ret != size) {
         (void)fclose(rgbFile);
         free(buffer);

services/etc/group

@@ -4,6 +4,7 @@ system:x:1000:
 radio:x:1001:
 bluetooth:x:1002:
 graphics:x:1003:
+samgr:x:1005:
 file_manager:x:1006:
 log:x:1007:
 user_data_rw:x:1008:
@@ -16,6 +17,7 @@ keystore:x:1017:
 usb:x:1018:
 drm:x:1019:
 media_rw:x:1023:
+dsoftbus:x:1024:
 nfc:x:1027:
 sdcard_r:x:1028:
 package_info:x:1032:
@@ -59,5 +61,6 @@ a2dp_host:x:3043:
 hdf_devmgr:x:3044:
 connected_tag_host:x:3045:
 dms:x:5522:
+sensor:x:6688:
 misc:x:9998:
 app:x:10000:

services/etc/param/ohos.para

@@ -55,7 +55,7 @@ const.product.bootloader.version=bootloader
 # OHOS_ABI_LIST[] = {"default"}
 const.product.cpu.abilist=default
 # OHOS_SECURITY_PATCH_TAG[] = { "2020-09-01" }
-const.ohos.version.security_patch=2020-09-01
+const.ohos.version.security_patch=2022-03-30
 # OHOS_DISPLAY_VERSION[] = {"OpenHarmony 3.1.5.2"}
 const.product.software.version=OpenHarmony 3.1.5.2
 # OHOS_INCREMENTAL_VERSION[] = {"default"}

services/etc/passwd

@@ -17,6 +17,7 @@ keystore:x:1017:1017:::/bin/false
 usb:x:1018:1018:::/bin/false
 drm:x:1019:1019:::/bin/false
 media_rw:x:1023:1023:::/bin/false
+dsoftbus:x:1024:1024:::/bin/false
 nfc:x:1027:1027:::/bin/false
 sdcard_r:x:1028:1028:::/bin/false
 package_info:x:1032:1032:::/bin/false
@@ -59,5 +60,6 @@ a2dp_host:x:3043:3043:::/bin/false
 hdf_devmgr:x:3044:3044:::/bin/false
 connected_tag_host:x:3045:3045:::/bin/false
 dms:x:5522:5522:::/bin/false
+sensor:x:6688:6688:::/bin/false
 misc:x:9998:9998:::/bin/false
 app:x:10000:10000:::/bin/false

services/init/init_common_service.c

@@ -229,7 +229,10 @@ static void PublishHoldFds(Service *service)
         fdBuffer[pos - 1] = '\0'; // Remove last ' '
         INIT_LOGI("fd buffer: [%s]", fdBuffer);
         char envName[MAX_BUFFER_LEN] = {};
-        (void)snprintf_s(envName, MAX_BUFFER_LEN, MAX_BUFFER_LEN - 1, ENV_FD_HOLD_PREFIX"%s", service->name);
+        if (snprintf_s(envName, MAX_BUFFER_LEN, MAX_BUFFER_LEN - 1, ENV_FD_HOLD_PREFIX"%s", service->name) < 0) {
+            INIT_LOGE("snprintf_s failed err=%d", errno);
+            return;
+        }
         if (setenv(envName, fdBuffer, 1) < 0) {
             INIT_LOGE("Failed to set env %s", envName);
         }
@@ -570,7 +573,7 @@ static void ServiceTimerStartProcess(const TimerHandle handler, void *context)
     ServiceStopTimer(service);
     int ret = ServiceStart(service);
     if (ret != SERVICE_SUCCESS) {
-        INIT_LOGE("Start service \' %s \' in timer failed");
+        INIT_LOGE("Start service \' %s \' in timer failed", service->name);
     }
 }
 

services/init/init_group_manager.c

@@ -24,7 +24,8 @@ static InitWorkspace g_initWorkspace = {0, 0, {0}, {0}, {0}};
 int GenerateHashCode(const char *key)
 {
     int code = 0;
-    for (size_t i = 0; i < strlen(key); i++) {
+    size_t keyLen = strlen(key);
+    for (size_t i = 0; i < keyLen; i++) {
         code += key[i] - 'A';
     }
     return code;

services/init/standard/fd_holder_service.c

@@ -62,12 +62,17 @@ static int HandlerHoldFds(Service *service, int *fds, size_t fdCount, const char
 
 static void SendErrorInfo(int sock, const char *errInfo, const char *serviceName)
 {
+    int ret = 0;
     char errBuffer[MAX_FD_HOLDER_BUFFER] = {};
     if (UNLIKELY(errInfo == NULL)) { // Should not happen.
         char *defaultError = "Unknonw error";
-        (void)strncpy_s(errBuffer, MAX_FD_HOLDER_BUFFER, defaultError, strlen(defaultError));
+        ret = strncpy_s(errBuffer, MAX_FD_HOLDER_BUFFER, defaultError, strlen(defaultError));
     } else {
-        (void)strncpy_s(errBuffer, MAX_FD_HOLDER_BUFFER, errInfo, strlen(errInfo));
+        ret = strncpy_s(errBuffer, MAX_FD_HOLDER_BUFFER, errInfo, strlen(errInfo));
+    }
+    if (ret != 0) {
+        INIT_LOGE("Failed to copy, err = %d", errno);
+        return;
     }
 
     struct iovec iovec = {
@@ -96,7 +101,10 @@ static void SendFdsInfo(int sock, Service *service)
         return;
     }
     char sendBuffer[MAX_FD_HOLDER_BUFFER] = {};
-    (void)strncpy_s(sendBuffer, MAX_FD_HOLDER_BUFFER, "send done", strlen("send done"));
+    if (strncpy_s(sendBuffer, MAX_FD_HOLDER_BUFFER, "send done", strlen("send done")) != 0) {
+        INIT_LOGE("Failed to copy, err = %d", errno);
+        return;
+    }
     struct iovec iovec = {
         .iov_base = sendBuffer,
         .iov_len = strlen(sendBuffer),
@@ -134,7 +142,7 @@ static void HandlerGetFds(int sock, Service *service)
     }
 
     if (service->fds == NULL || service->fdCount == 0) {
-        INIT_LOGE("Service \' %s \' does not have any held fds");
+        INIT_LOGE("Service \' %s \' does not have any held fds", service->name);
         errorInfo = "Service without any fds";
     }