diff --git a/frameworks/datatransmitmgr/dev_slinfo_list.c b/frameworks/datatransmitmgr/dev_slinfo_list.c index cc337198e432d9fa39be81bb6fa09c60b186527c..1e9a6d17030066445b92dae09dc88b33c5f13d59 100644 --- a/frameworks/datatransmitmgr/dev_slinfo_list.c +++ b/frameworks/datatransmitmgr/dev_slinfo_list.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,20 +19,20 @@ #include "dev_slinfo_adpt.h" #include "dev_slinfo_log.h" -pthread_mutex_t gMutex; +pthread_mutex_t g_Mutex; struct DATASLListParams* InitList(void) { - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); struct DATASLListParams *list = (struct DATASLListParams *)malloc(sizeof(struct DATASLListParams)); if (list == NULL) { - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return NULL; } list->next = list; list->prev = list; list->callbackParams = NULL; - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return list; } @@ -47,22 +47,22 @@ static void UpdateListNode(struct DATASLListParams *newListNode, int32_t PushListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams) { - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); struct DATASLListParams *newList = (struct DATASLListParams*)malloc(sizeof(struct DATASLListParams)); if (newList == NULL) { - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return DEVSL_ERR_OUT_OF_MEMORY; } UpdateListNode(newList, list->prev, list); newList->callbackParams = callbackParams; - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return DEVSL_SUCCESS; } void RemoveListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams) { - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); struct DATASLListParams *pList = list->next; while (pList != NULL && pList != list) { if (CompareUdid(&(pList->callbackParams->queryParams), &(callbackParams->queryParams)) == DEVSL_SUCCESS) { @@ -78,14 +78,14 @@ void RemoveListNode(struct DATASLListParams *list, struct DATASLCallbackParams } pList = pList->next; } - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); } void ClearList(struct DATASLListParams *list) { - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); if (list == NULL) { - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return; } struct DATASLListParams *pList = list->next; @@ -103,19 +103,19 @@ void ClearList(struct DATASLListParams *list) free(list->callbackParams); } free(list); - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); } int32_t GetListLength(struct DATASLListParams *list) { - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); struct DATASLListParams *pList = list->next; int32_t listLength = 0; while (pList != NULL && pList != list) { listLength++; pList = pList->next; } - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); return listLength; } @@ -124,7 +124,7 @@ void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams struct DATASLCallbackParams tmpCallbackParams; (void)memset_s(&tmpCallbackParams, sizeof(struct DATASLCallbackParams), 0, sizeof(struct DATASLCallbackParams)); int32_t ret = DEVSL_ERROR; - (void)pthread_mutex_lock(&gMutex); + (void)pthread_mutex_lock(&g_Mutex); struct DATASLListParams *tmpCallback = list->next; while (tmpCallback != NULL && tmpCallback != list) { struct DATASLListParams *nextCallback = tmpCallback->next; @@ -145,7 +145,7 @@ void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams } tmpCallback = nextCallback; } - (void)pthread_mutex_unlock(&gMutex); + (void)pthread_mutex_unlock(&g_Mutex); if (ret == DEVSL_SUCCESS) { tmpCallbackParams.callback(&(tmpCallbackParams.queryParams), result, levelInfo); } @@ -154,11 +154,11 @@ void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams int32_t InitPthreadMutex(void) { int32_t ret; - ret = pthread_mutex_init(&gMutex, NULL); + ret = pthread_mutex_init(&g_Mutex, NULL); return ret; } void DestroyPthreadMutex(void) { - pthread_mutex_destroy(&gMutex); + pthread_mutex_destroy(&g_Mutex); } \ No newline at end of file diff --git a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/datatransmitmgr_fuzzer.cpp b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/datatransmitmgr_fuzzer.cpp index 02e46b38c681ac445a323fbad55d1cf8e669d331..465ee9ec98e256b0e8d942d24dad855affe128e2 100644 --- a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/datatransmitmgr_fuzzer.cpp +++ b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/datatransmitmgr_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -73,22 +73,22 @@ namespace OHOS { } } -static void NativeTokenGet() +static void NativeTokenGetFUZZ() { uint64_t tokenId; const char **perms = new const char *[1]; perms[0] = "ohos.permission.DISTRIBUTED_DATASYNC"; NativeTokenInfoParams infoInstance = { + .acls = nullptr, + .dcaps = nullptr, + .aclsNum = 0, .dcapsNum = 0, .permsNum = 1, - .aclsNum = 0, - .dcaps = nullptr, .perms = perms, - .acls = nullptr, .aplStr = "system_basic", }; - infoInstance.processName = "DevSLMgrTest"; + infoInstance.processName = "DataTransmitMgrFuzzTest"; tokenId = GetAccessTokenId(&infoInstance); SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); @@ -99,7 +99,7 @@ static void NativeTokenGet() extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ - NativeTokenGet(); + NativeTokenGetFUZZ(); OHOS::FuzzDoDataTransmitMgr(data, size); return 0; } \ No newline at end of file diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index d34aae78bab3af6007e4075a7ea829d4d036a7f6..4b6e22575ea0a58f71bded13b6810c927667db86 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -354,7 +354,7 @@ static struct DATASLListParams *g_tmpList = nullptr; static void ListCallback(DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo) { - EXPECT_EQ(DEVSL_SUCCESS, DEVSL_SUCCESS); + EXPECT_EQ(result, DEVSL_SUCCESS); } static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelExcept003, TestSize.Level1) @@ -380,9 +380,7 @@ static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelExcept003, TestSize.Level1) struct DATASLCallbackParams *newListNode = (struct DATASLCallbackParams*)malloc(sizeof(struct DATASLCallbackParams)); - if (newListNode == nullptr) { - EXPECT_EQ(DEVSL_SUCCESS, DEVSL_SUCCESS); - } + EXPECT_NE(newListNode, nullptr); (void)memcpy_s(newListNode->queryParams.udid, MAX_UDID_LENGTH, queryParamsOpp.udid, queryParamsOpp.udidLen); newListNode->queryParams.udidLen = queryParamsOpp.udidLen; newListNode->callback = &ListCallback; @@ -407,9 +405,7 @@ static void AddList(void) struct DATASLCallbackParams *newListNode = (struct DATASLCallbackParams*)malloc(sizeof(struct DATASLCallbackParams)); - if (newListNode == nullptr) { - EXPECT_EQ(DEVSL_SUCCESS, DEVSL_SUCCESS); - } + EXPECT_NE(newListNode, nullptr); (void)memcpy_s(newListNode->queryParams.udid, MAX_UDID_LENGTH, queryParams.udid, queryParams.udidLen); newListNode->queryParams.udidLen = queryParams.udidLen; newListNode->callback = &tmpCallbackExcept004;