From 44c1e06c86d1ae6b0e87bce2ce4442358fd74ed4 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:11:54 +0000 Subject: [PATCH 1/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/hostapd/client/src/hostapd_client.c | 2 +- wlan/wpa/client/src/wpa_client.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wlan/hostapd/client/src/hostapd_client.c b/wlan/hostapd/client/src/hostapd_client.c index 43f0266b86..2b9a5136b9 100644 --- a/wlan/hostapd/client/src/hostapd_client.c +++ b/wlan/hostapd/client/src/hostapd_client.c @@ -43,7 +43,7 @@ int32_t HostapdRegisterEventCallback(OnReceiveFunc onRecFunc, uint32_t eventType int ifNameLen = 0; if (ifName != NULL) { - ifNameLen = strnlen(ifName, IFNAMSIZ + 1); + ifNameLen = (int)(strnlen(ifName, IFNAMSIZ + 1)); } if (onRecFunc == NULL || ifName == NULL || ifNameLen == (IFNAMSIZ + 1)) { HDF_LOGE("%s: input parameter invalid, line: %d", __FUNCTION__, __LINE__); diff --git a/wlan/wpa/client/src/wpa_client.c b/wlan/wpa/client/src/wpa_client.c index 192d8702ad..5bcc533529 100644 --- a/wlan/wpa/client/src/wpa_client.c +++ b/wlan/wpa/client/src/wpa_client.c @@ -43,7 +43,7 @@ int32_t WpaRegisterEventCallback(OnReceiveFunc onRecFunc, uint32_t eventType, co int ifNameLen = 0; if (ifName != NULL) { - ifNameLen = strnlen(ifName, IFNAMSIZ + 1); + ifNameLen = (int)(strnlen(ifName, IFNAMSIZ + 1)); } if (onRecFunc == NULL || ifName == NULL || ifNameLen == (IFNAMSIZ + 1)) { HDF_LOGE("%s: input parameter invalid, line: %d", __FUNCTION__, __LINE__); -- Gitee From 84f4ed63517ca8eef28dacb88479102ec1e39a79 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:11:59 +0000 Subject: [PATCH 2/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c index 527e722172..5a00e7fc23 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c @@ -191,7 +191,7 @@ unsigned int StrtoUint(const char *input) } char *endPtr = NULL; unsigned long result = 0; - result = strtol(input, &endPtr, NUMBER_BASE); + result = (unsigned long)(strtol(input, &endPtr, NUMBER_BASE)); if (endPtr == input || *endPtr != '\0') { HDF_LOGE("StrtoUint: invalid data!"); -- Gitee From d6634061a075585a856b5ec5caf2a617c20ea4ad Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:13:43 +0000 Subject: [PATCH 3/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c index 5a00e7fc23..2e0220702a 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c @@ -1,3 +1,6 @@ +wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c +105 info->flagsLen = (unsigned int)falgLen + 1; +119 info->clientListLen = (unsigned int)clientLen + 1; /* * Copyright (C) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); -- Gitee From 0ff64d26ca1e938062764b674fc9e0ed43a1558f Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:27:32 +0000 Subject: [PATCH 4/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/client/src/netlink/netlink_event_adapter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wlan/client/src/netlink/netlink_event_adapter.c b/wlan/client/src/netlink/netlink_event_adapter.c index 8c0bd30ade..723504aa22 100644 --- a/wlan/client/src/netlink/netlink_event_adapter.c +++ b/wlan/client/src/netlink/netlink_event_adapter.c @@ -284,6 +284,7 @@ static void WifiEventScanResultProcess(const char *ifName) } if (InitScanResults(&scanResults) != RET_CODE_SUCCESS) { HILOG_ERROR(LOG_CORE, "%s: InitScanResults failed", __FUNCTION__); + nlmsg_free(msg); return; } arg.scanResults = &scanResults; -- Gitee From 4193fe7b14ff251592a20310644580b779288cf4 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:27:35 +0000 Subject: [PATCH 5/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c index 2e0220702a..742fa172f1 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c @@ -215,7 +215,7 @@ int StrtoInt(const char *input) } char *endPtr = NULL; long result = 0; - result = strtol(input, &endPtr, NUMBER_BASE); + result = (unsigned long)strtol(input, &endPtr, NUMBER_BASE); if (endPtr == input || *endPtr != '\0') { HDF_LOGE("StrtoInt: invalid data!"); -- Gitee From 2f2ad0345d398f75b4de1c11df7aeac4ce222038 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 10:27:39 +0000 Subject: [PATCH 6/7] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../hdi_service/service_common/wpa_supplicant_hal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_supplicant_hal.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_supplicant_hal.c index 7246243273..e836cfa7b7 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_supplicant_hal.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_supplicant_hal.c @@ -1359,6 +1359,10 @@ static void GetInfoElems(int length, int end, char *srcBuf, ScanInfo *pcmd) } len = last - start - 1; infoElemsTemp[infoElemsSize].size = len / lenValue; + if ( (len / lenValue + 1) <= 0) { + HDF_LOGI("GetInfoElems len = %{public}d", len); + break; + } infoElemsTemp[infoElemsSize].content = (char *)calloc(len / lenValue + 1, sizeof(char)); if (infoElemsTemp[infoElemsSize].content == NULL) { break; -- Gitee From 763b12d85b94122715f41b4327afc7e321d11531 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 22 Jul 2025 19:23:28 +0800 Subject: [PATCH 7/7] 11 Signed-off-by: chen yi wen <15068825070@163.com> --- wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c | 3 --- wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c index 742fa172f1..b49fc2d7ce 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_hdi_util.c @@ -1,6 +1,3 @@ -wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c -105 info->flagsLen = (unsigned int)falgLen + 1; -119 info->clientListLen = (unsigned int)clientLen + 1; /* * Copyright (C) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c b/wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c index afa62019b3..9fb5766fbd 100644 --- a/wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c +++ b/wlan/wpa/interfaces/hdi_service/service_common/wpa_p2p_cmd.c @@ -102,7 +102,7 @@ static void GetFlagInfo(char *res, struct HdiP2pNetworkInfo *info) HDF_LOGE("malloc flags failed!"); return; } - info->flagsLen = falgLen + 1; + info->flagsLen = (unsigned int)falgLen + 1; if (strcpy_s((char *)info->flags, falgLen + 1, res) != EOK) { HDF_LOGE("GetFlagInfo strcpy_s failed!"); } @@ -116,7 +116,7 @@ static void GetClientListInfo(char *res, struct HdiP2pNetworkInfo *info) HDF_LOGE("malloc client list failed!"); return; } - info->clientListLen = clientLen + 1; + info->clientListLen = (unsigned int)clientLen + 1; if (strcpy_s((char *)info->clientList, clientLen + 1, res) != EOK) { HDF_LOGE("GetClientListInfo strcpy_s failed!"); } -- Gitee