diff --git a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
index d98d9b791e18686fea56d6ce432c447ae013f682..9fbccd7d6e79d7d79ff691a87a8bf58ed9b8eca3 100644
--- a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
+++ b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
@@ -68,7 +68,7 @@ public:
             return -1;
         }
 
-        if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyLen, srcBuffer, copyLen) != 0) {
+        if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyIndex, srcBuffer, copyLen) != 0) {
             return -1;
         }
 
diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp
index 67bd749b06cc7a0480157d1b5e69a5cf19e14282..3629332c0f9e205e4eb3a8f2e6a61da486a761a4 100644
--- a/interfaces/kits/js/src/native_devicemanager_js.cpp
+++ b/interfaces/kits/js/src/native_devicemanager_js.cpp
@@ -392,7 +392,7 @@ void DeviceManagerNapi::DmAuthParamToJsAuthParamy(const napi_env &env,
         napi_create_arraybuffer(env, appIconLen, &appIcon, &appIconBuffer);
         if (appIcon != nullptr &&
             memcpy_s(appIcon, appIconLen, reinterpret_cast<const void*>(authParam.imageinfo.GetAppIcon()),
-            appIconLen) == 0) {
+                appIconLen) == 0) {
             napi_value appIconArray = nullptr;
             napi_create_typedarray(env, napi_uint8_array, appIconLen, appIconBuffer, 0, &appIconArray);
             napi_set_named_property(env, paramResult, "appIcon", appIconArray);
diff --git a/services/devicemanagerservice/include/timer/dm_timer.h b/services/devicemanagerservice/include/timer/dm_timer.h
index f0deba4a7288ea167d3a120582e66a7102b0ecac..61b763e995ac27a779775df3c4ebbb7b4ccf5e78 100644
--- a/services/devicemanagerservice/include/timer/dm_timer.h
+++ b/services/devicemanagerservice/include/timer/dm_timer.h
@@ -29,7 +29,6 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-
 typedef void (*TimeoutHandle)(void *data);
 
 #define MAXEVENTS 255
diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp
index ad2141de87959ccf469b6ab1058d4747ec9a832c..7fe96002cda0eca59dce719316e55774688f2832 100644
--- a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp
+++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp
@@ -74,6 +74,9 @@ int32_t IpcServerListener::SendAll(int32_t cmdCode, std::shared_ptr<IpcReq> req,
         SvcIdentity svc;
         IpcIo io;
         uint8_t data[MAX_DM_IPC_LEN] = {0};
+        std::string pkgName = kv.first;
+
+        req->SetPkgName(pkgName);
         if (IpcCmdRegister::GetInstance().SetRequest(cmdCode, req, io, data, MAX_DM_IPC_LEN) != DEVICEMANAGER_OK) {
             DMLOG(DM_LOG_DEBUG, "SetRequest failed cmdCode:%d", cmdCode);
             continue;
diff --git a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
index c259394f5a0bf9cb4e7d794b09482761d588a12c..7cf317ccdf180528d69eef3bd295c6de6ce65f22 100644
--- a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
+++ b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
@@ -69,9 +69,11 @@ bool IpcServerStub::Init()
         registerToService_ = true;
     }
 
-    std::thread {[] {
-        IpcServerAdapter::GetInstance().ModuleInit();
-    }}.detach();
+    std::thread {
+        [] {
+            IpcServerAdapter::GetInstance().ModuleInit();
+        }
+    }.detach();
     return true;
 }
 
diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp
index ef3ede248ddd6be8d95b8ebe8659e7b1ce07a341..88ed64aab5cc5b5890e5362945fd0315de1952e6 100644
--- a/services/devicemanagerservice/src/message/msg_request_auth.cpp
+++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp
@@ -45,8 +45,8 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std:
     }
 
     mAuthType_ = jsonObject.contains(AUTH_TYPE) ? (int32_t)jsonObject[AUTH_TYPE] : AUTH_TYPE_QR;
-    mHead_ = std::make_shared<MsgHead>(mAuthType_ == AUTH_TYPE_QR ? DmMsgType::MSG_TYPE_REQ_AUTH :
-        DmMsgType::MSG_TYPE_AUTH_BY_PIN);
+    mHead_ = std::make_shared<MsgHead>((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) :
+        (DmMsgType::MSG_TYPE_AUTH_BY_PIN));
     char localDeviceId[DEVICE_UUID_LENGTH] = {0};
     GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH);
     mDeviceName_ = devReqInfo.deviceName;