diff --git a/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp b/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp index e3b4cac1bf679fd63d02502f6b9ed3b2d180659b..f6d3db3cd317e9e6df9446c7d70dbbba439a43bd 100644 --- a/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp +++ b/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp @@ -318,9 +318,11 @@ int HdfRemoteAdapterAddSa(int32_t saId, struct HdfRemoteService *service) HDF_LOGI("GetSystemAbilityManager success"); break; } +// LCOV_EXCL_START HDF_LOGI("GetSystemAbilityManager failed, retry"); usleep(sleepInterval); } +// LCOV_EXCL_STOP if (saManager == nullptr) { HDF_LOGE("failed to get sa manager, waiting timeout"); return HDF_FAILURE; @@ -376,9 +378,11 @@ struct HdfRemoteService *HdfRemoteAdapterGetSa(int32_t saId) if (remote != nullptr) { return HdfRemoteAdapterBind(remote); } else { +// LCOV_EXCL_START HDF_LOGE("failed to get sa %{public}d", saId); } return nullptr; +// LCOV_EXCL_STOP } bool HdfRemoteAdapterSetInterfaceDesc(struct HdfRemoteService *service, const char *desc) @@ -496,8 +500,10 @@ int HdfRemoteAdapterDefaultDispatch(struct HdfRemoteService *service, OHOS::IPCObjectStub *stub = reinterpret_cast(holder->remote_.GetRefPtr()); if (stub == nullptr) { +// LCOV_EXCL_START HDF_LOGE("%{public}s: failed to converts holder->remote to IPCObjectStub object", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } OHOS::MessageParcel *dataParcel = nullptr; @@ -505,13 +511,17 @@ int HdfRemoteAdapterDefaultDispatch(struct HdfRemoteService *service, OHOS::MessageOption option; if (SbufToParcel(data, &dataParcel) != HDF_SUCCESS) { +// LCOV_EXCL_START HDF_LOGE("%{public}s:invalid data sbuf object to dispatch", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } if (SbufToParcel(data, &replyParcel) != HDF_SUCCESS) { +// LCOV_EXCL_START HDF_LOGE("%{public}s:invalid reply sbuf object to dispatch", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } return stub->IPCObjectStub::OnRemoteRequest(code, *dataParcel, *replyParcel, option); diff --git a/adapter/uhdf2/manager/src/devsvc_manager_stub.c b/adapter/uhdf2/manager/src/devsvc_manager_stub.c index 1096e8e711bbe85b69786cd272105ec841a5941d..968d522aee7428365747336ad0f6d712ce35261a 100644 --- a/adapter/uhdf2/manager/src/devsvc_manager_stub.c +++ b/adapter/uhdf2/manager/src/devsvc_manager_stub.c @@ -328,13 +328,17 @@ static int32_t DevSvcManagerStubGetService(struct IDevSvcManager *super, struct int ret = HDF_FAILURE; struct DevSvcManagerStub *stub = (struct DevSvcManagerStub *)super; if (!HdfRemoteServiceCheckInterfaceToken(stub->remote, data)) { +// LCOV_EXCL_START HDF_LOGE("%{public}s: invalid interface token", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } const char *name = HdfSbufReadString(data); if (name == NULL) { +// LCOV_EXCL_START HDF_LOGE("%{public}s failed, name is null", __func__); return ret; +// LCOV_EXCL_STOP } ret = GetServicePermCheck(name); if (ret != HDF_SUCCESS) { @@ -397,13 +401,17 @@ static int32_t DevSvcManagerStubListServiceByInterfaceDesc( int ret; struct DevSvcManagerStub *stub = (struct DevSvcManagerStub *)super; if (!HdfRemoteServiceCheckInterfaceToken(stub->remote, data)) { +// LCOV_EXCL_START HDF_LOGE("%{public}s: invalid interface token", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } const char *interfaceDesc = HdfSbufReadString(data); if (interfaceDesc == NULL) { +// LCOV_EXCL_START HDF_LOGE("%{public}s failed, interfaceDesc is null", __func__); return HDF_FAILURE; +// LCOV_EXCL_STOP } ret = ListServicePermCheck(); if (ret != HDF_SUCCESS) { @@ -418,13 +426,17 @@ static int32_t DevSvcManagerStubRemoveService(struct IDevSvcManager *super, stru { struct DevSvcManagerStub *stub = (struct DevSvcManagerStub *)super; if (!HdfRemoteServiceCheckInterfaceToken(stub->remote, data)) { +// LCOV_EXCL_START HDF_LOGE("%{public}s: invalid interface token", __func__); return HDF_ERR_INVALID_PARAM; +// LCOV_EXCL_STOP } const char *name = HdfSbufReadString(data); if (name == NULL) { +// LCOV_EXCL_START HDF_LOGE("%{public}s failed, name is null", __func__); return HDF_FAILURE; +// LCOV_EXCL_STOP } int32_t ret = AddServicePermCheck(name); if (ret != HDF_SUCCESS) { @@ -628,13 +640,17 @@ int DevSvcManagerStubStart(struct IDevSvcManager *svcmgr) static struct HdfRemoteDispatcher dispatcher = {.Dispatch = DevSvcManagerStubDispatch}; inst->remote = HdfRemoteServiceObtain((struct HdfObject *)inst, &dispatcher); if (inst->remote == NULL) { +// LCOV_EXCL_START HDF_LOGE("failed to obtain device service manager remote service"); return HDF_ERR_MALLOC_FAIL; +// LCOV_EXCL_STOP } if (!HdfRemoteServiceSetInterfaceDesc(inst->remote, "HDI.IServiceManager.V1_0")) { +// LCOV_EXCL_START HDF_LOGE("%{public}s: failed to init interface desc", __func__); HdfRemoteServiceRecycle(inst->remote); return HDF_ERR_INVALID_OBJECT; +// LCOV_EXCL_STOP } inst->recipient.OnRemoteDied = DevSvcManagerOnServiceDied; @@ -657,8 +673,10 @@ static bool DevSvcManagerStubConstruct(struct DevSvcManagerStub *inst) return false; } if (!DevSvcManagerConstruct(&inst->super)) { +// LCOV_EXCL_START HDF_LOGE("failed to construct device service manager"); return false; +// LCOV_EXCL_STOP } inst->super.super.StartService = DevSvcManagerStubStart; OsalMutexInit(&inst->devSvcStubMutex); diff --git a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp index 6089417d360d8402741a8cbf734dd43a2a1b8d3d..3d6e18c3d9401a38581475a10904de844f4d87f1 100644 --- a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp +++ b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp @@ -61,8 +61,7 @@ bool UnregisterServiceStatusListenerFuzzTest(const uint8_t *data, size_t size) OsalUSleep(WAIT_THRESHOLD); OsalUDelay(THRESHOLD); OsalMDelay(THRESHOLD); - uint64_t time = OsalGetSysTimeMs(); - HDF_LOGD("%{public}s: time is %{public}llu!", __func__, time); + (void)OsalGetSysTimeMs(); return result; }