From 31662571a617b61a9b8b5ca8098ec523610abeef Mon Sep 17 00:00:00 2001 From: wanghongen Date: Fri, 22 Aug 2025 20:18:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?5.1.1=E6=99=BA=E6=85=A7=E5=B1=8F=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanghongen --- adapter/uhdf2/manager/src/devmgr_dump.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 378d8a146..a06a64da7 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -358,9 +358,10 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui const uint32_t devNameAlign = 8; const uint32_t devIdAlign = 40; const uint32_t servNameAlign = 56; - uint32_t devCnt; - uint32_t devId; + uint32_t devCnt = 0; + uint32_t devId = 0; const uint32_t strEndLen = 2; + const uint32_t HOST_MAX = 100000; while (true) { if (DevMgrFillDeviceHostInfo(data, reply) != HDF_SUCCESS) { -- Gitee From c9023ac05722f43f1e703d87e7b65e61c828d793 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Fri, 22 Aug 2025 12:40:57 +0000 Subject: [PATCH 2/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index a06a64da7..9cb80fa02 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -370,7 +370,10 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - + if (devCnt <= 0 || devCnt >100000 ) { + HDF_LOGE("devCnt is over"); + return; + } for (uint32_t i = 0; i < devCnt; i++) { // The line is a combination of multiple fields, and the fields are filled with blank characters (void)memset_s(line, sizeof(line), ' ', sizeof(line)); -- Gitee From c3524a6cf5b0d2710cbfbc82e9ae423633e8b072 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 01:08:18 +0000 Subject: [PATCH 3/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 9cb80fa02..666d33882 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -361,7 +361,6 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui uint32_t devCnt = 0; uint32_t devId = 0; const uint32_t strEndLen = 2; - const uint32_t HOST_MAX = 100000; while (true) { if (DevMgrFillDeviceHostInfo(data, reply) != HDF_SUCCESS) { @@ -370,7 +369,7 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - if (devCnt <= 0 || devCnt >100000 ) { + if (devCnt <= 0 || devCnt > 100000 ) { HDF_LOGE("devCnt is over"); return; } -- Gitee From fb4786f3ccbc01b2d2636d10989cdd6cff290b98 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 02:18:15 +0000 Subject: [PATCH 4/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 666d33882..6ce06643b 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -30,6 +30,10 @@ #define HDF_LOG_TAG devmgr_dump +#ifndef DEVCNT_MAX +#define DEVCNT_MAX (100000) +#endif + static const char *HELP_COMMENT = " usage:\n" " -help :display help information\n" @@ -369,7 +373,7 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - if (devCnt <= 0 || devCnt > 100000 ) { + if (devCnt <= 0 || devCnt > DEVCNT_MAX ) { HDF_LOGE("devCnt is over"); return; } -- Gitee From fcbb2db34363f4baaaa277f3c1fb10f89c700017 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 02:40:03 +0000 Subject: [PATCH 5/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 6ce06643b..d7fa5053c 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -373,7 +373,7 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - if (devCnt <= 0 || devCnt > DEVCNT_MAX ) { + if (devCnt <= 0 || devCnt > DEVCNT_MAX) { HDF_LOGE("devCnt is over"); return; } -- Gitee From 68fb37891eb97d28a62bd61e0c1167c5def7a6b8 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 07:55:16 +0000 Subject: [PATCH 6/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index d7fa5053c..bd1332dbd 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -30,8 +30,8 @@ #define HDF_LOG_TAG devmgr_dump -#ifndef DEVCNT_MAX -#define DEVCNT_MAX (100000) +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) #endif static const char *HELP_COMMENT = @@ -373,7 +373,7 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - if (devCnt <= 0 || devCnt > DEVCNT_MAX) { + if (devCnt <= 0 || devCnt > UINT32_MAX) { HDF_LOGE("devCnt is over"); return; } -- Gitee From 123e388d0a7f2349a21225cfe5baed6b460988fd Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 08:20:31 +0000 Subject: [PATCH 7/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index bd1332dbd..9176f297d 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -14,7 +14,7 @@ */ #include "securec.h" - +#include "stdint.h" #include "devmgr_service.h" #include "devhost_service_clnt.h" #include "devhost_service_proxy.h" @@ -30,8 +30,8 @@ #define HDF_LOG_TAG devmgr_dump -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) +#ifndef DEVCNT_MAX +#define DEVCNT_MAX UINT32_MAX #endif static const char *HELP_COMMENT = @@ -373,7 +373,7 @@ static void DevMgrFillDeviceInfo(struct HdfSBuf *data, struct HdfSBuf *reply, ui (void)HdfSbufReadUint32(data, &devCnt); (*hostCnt)++; - if (devCnt <= 0 || devCnt > UINT32_MAX) { + if (devCnt <= 0 || devCnt > DEVCNT_MAX) { HDF_LOGE("devCnt is over"); return; } -- Gitee From 24b0ca51428f6117138f8e8d947065f4d0a015ed Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Mon, 25 Aug 2025 08:22:45 +0000 Subject: [PATCH 8/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 9176f297d..44e9b7869 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -14,7 +14,7 @@ */ #include "securec.h" -#include "stdint.h" +#include #include "devmgr_service.h" #include "devhost_service_clnt.h" #include "devhost_service_proxy.h" -- Gitee From 6453c097f21ac685ac3d689cb693674068deac01 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Wed, 27 Aug 2025 08:54:11 +0000 Subject: [PATCH 9/9] update adapter/uhdf2/manager/src/devmgr_dump.c. Signed-off-by: wanghongenaf --- adapter/uhdf2/manager/src/devmgr_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 44e9b7869..2307179e4 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -31,7 +31,7 @@ #define HDF_LOG_TAG devmgr_dump #ifndef DEVCNT_MAX -#define DEVCNT_MAX UINT32_MAX +#define DEVCNT_MAX (200000) #endif static const char *HELP_COMMENT = -- Gitee