From 7b90c7320225fb6cc7fb286afc7aec558575cf55 Mon Sep 17 00:00:00 2001
From: wangzhaohao <wangzhaohao@huawei.com>
Date: Thu, 19 Dec 2024 15:08:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfuzz=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhaohao <wangzhaohao@huawei.com>
---
 .../dhtransport_fuzzer/dhtransport_fuzzer.cpp | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
index a8a8ebf4..e4f42b11 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
+++ b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
@@ -22,6 +22,8 @@
 #include <string>
 #include <unistd.h>
 
+#include <fuzzer/FuzzedDataProvider.h>
+
 #include "constants.h"
 #include "dh_transport.h"
 #include "dh_comm_tool.h"
@@ -39,12 +41,15 @@ void DhTransportOnBytesReceivedFuzzTest(const uint8_t* data, size_t size)
         return;
     }
 
-    int32_t socketId = *(reinterpret_cast<const int32_t*>(data));
+    FuzzedDataProvider fdp(data, size);
+    int32_t socketId = fdp.ConsumeIntegral<int32_t>();
     std::shared_ptr<DHCommTool> dhCommTool = std::make_shared<DHCommTool>();
     std::shared_ptr<DHTransport> dhTransportTest = std::make_shared<DHTransport>(dhCommTool);
     std::string remoteNetworkId = "remoteNetworkId_test";
     dhTransportTest->remoteDevSocketIds_[remoteNetworkId] = socketId;
-    dhTransportTest->OnBytesReceived(socketId, data, size);
+    const char *paramData = fdp.ConsumeRandomLengthString().c_str();
+    uint32_t dataLen = fdp.ConsumeIntegral<uint32_t>();
+    dhTransportTest->OnBytesReceived(socketId, paramData, dataLen);
     dhTransportTest->remoteDevSocketIds_.clear();
 }
 
@@ -114,8 +119,9 @@ void DhTransportSendFuzzTest(const uint8_t* data, size_t size)
     if ((data == nullptr) || (size == 0)) {
         return;
     }
-    std::string remoteNetworkId(reinterpret_cast<const char*>(data), size);
-    std::string payload(reinterpret_cast<const char*>(data), size);
+    FuzzedDataProvider fdp(data, size);
+    std::string remoteNetworkId = fdp.ConsumeRandomLengthString();
+    std::string payload = fdp.ConsumeRandomLengthString();
     std::shared_ptr<DHCommTool> dhCommTool = std::make_shared<DHCommTool>();
     std::shared_ptr<DHTransport> dhTransportTest = std::make_shared<DHTransport>(dhCommTool);
     dhTransportTest->remoteDevSocketIds_[remoteNetworkId] = 1;
@@ -128,9 +134,10 @@ void DhTransportOnSocketOpenedFuzzTest(const uint8_t* data, size_t size)
     if ((data == nullptr) || (size < sizeof(int32_t))) {
         return;
     }
-    int32_t socketId = *(reinterpret_cast<const int32_t*>(data));
-    std::string peerSocketName(reinterpret_cast<const char*>(data), size);
-    std::string remoteNetworkId(reinterpret_cast<const char*>(data), size);
+    FuzzedDataProvider fdp(data, size);
+    int32_t socketId = fdp.ConsumeIntegral<int32_t>();
+    std::string peerSocketName = fdp.ConsumeRandomLengthString();
+    std::string remoteNetworkId = fdp.ConsumeRandomLengthString();
     PeerSocketInfo info = {
         .name = const_cast<char*>(peerSocketName.c_str()),
         .networkId = const_cast<char*>(remoteNetworkId.c_str()),
-- 
Gitee


From 6fd148e7bc2e9d133b07410b2ebdc5ddc52724af Mon Sep 17 00:00:00 2001
From: wangzhaohao <wangzhaohao@huawei.com>
Date: Thu, 19 Dec 2024 15:48:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfuzz=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangzhaohao <wangzhaohao@huawei.com>
---
 .../test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
index e4f42b11..979a4038 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
+++ b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/dhtransport_fuzzer.cpp
@@ -48,8 +48,7 @@ void DhTransportOnBytesReceivedFuzzTest(const uint8_t* data, size_t size)
     std::string remoteNetworkId = "remoteNetworkId_test";
     dhTransportTest->remoteDevSocketIds_[remoteNetworkId] = socketId;
     const char *paramData = fdp.ConsumeRandomLengthString().c_str();
-    uint32_t dataLen = fdp.ConsumeIntegral<uint32_t>();
-    dhTransportTest->OnBytesReceived(socketId, paramData, dataLen);
+    dhTransportTest->OnBytesReceived(socketId, paramData, size);
     dhTransportTest->remoteDevSocketIds_.clear();
 }
 
-- 
Gitee