Merge branch 'master' into update_pigweed

Author: andreilitvin

examples/all-clusters-app/linux/fuzzing-main.cpp

@@ -73,9 +73,20 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
     // For now, just dump the data as a UDP payload into the session manager.
     // But maybe we should try to separately extract a PeerAddress and data from
     // the incoming data?
-    Transport::PeerAddress peerAddr;
+
+    // To avoid out-of-bounds access when acessing aData[1]
+    if (aSize < 2)
+    {
+        return 0;
+    }
+
+    // dumping payload with fuzzed transport types
+    constexpr uint8_t numberOfTypes     = static_cast<int>(Transport::Type::kLast) + 1;
+    Transport::Type fuzzedTransportType = static_cast<Transport::Type>(aData[0] % numberOfTypes);
+    Transport::PeerAddress peerAddr(fuzzedTransportType);
+
     System::PacketBufferHandle buf =
-        System::PacketBufferHandle::NewWithData(aData, aSize, /* aAdditionalSize = */ 0, /* aReservedSize = */ 0);
+        System::PacketBufferHandle::NewWithData(&aData[1], aSize - 1, /* aAdditionalSize = */ 0, /* aReservedSize = */ 0);
     if (buf.IsNull())
     {
         // Too big; we couldn't represent this as a packetbuffer to start with.
@@ -84,8 +95,17 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
 
     // Ignoring the return value from OnMessageReceived, because we might be
     // passing it all sorts of garbage that will cause it to fail.
-    Server::GetInstance().GetSecureSessionManager().OnMessageReceived(peerAddr, std::move(buf));
 
+    // for TCP we need to have MessageTransportContext
+    if (fuzzedTransportType == Transport::Type::kTcp)
+    {
+        Transport::MessageTransportContext msgContext;
+        Server::GetInstance().GetSecureSessionManager().OnMessageReceived(peerAddr, std::move(buf), &msgContext);
+    }
+    else
+    {
+        Server::GetInstance().GetSecureSessionManager().OnMessageReceived(peerAddr, std::move(buf));
+    }
     // Now process pending events until our sentinel is reached.
     PlatformMgr().ScheduleWork([](intptr_t) { PlatformMgr().StopEventLoopTask(); });
     PlatformMgr().RunEventLoop();

examples/fabric-admin/scripts/fabric-sync-app.py

@@ -31,10 +31,7 @@ async def forward_f(prefix: bytes, f_in: asyncio.StreamReader,
 
     This function can optionally feed received lines to a callback function.
     """
-    while True:
-        line = await f_in.readline()
-        if not line:
-            break
+    while line := await f_in.readline():
         if cb is not None:
             cb(line)
         f_out.buffer.write(prefix)
@@ -68,11 +65,7 @@ async def forward_stdin(f_out: asyncio.StreamWriter):
     reader = asyncio.StreamReader()
     protocol = asyncio.StreamReaderProtocol(reader)
     await loop.connect_read_pipe(lambda: protocol, sys.stdin)
-    while True:
-        line = await reader.readline()
-        if not line:
-            # Exit on Ctrl-D (EOF).
-            sys.exit(0)
+    while line := await reader.readline():
         f_out.write(line)
         await f_out.drain()
 
@@ -206,12 +199,16 @@ async def main(args):
             passcode=args.passcode,
         ))
 
+    loop = asyncio.get_event_loop()
+
     def terminate():
-        admin.terminate()
-        bridge.terminate()
-        sys.exit(0)
+        with contextlib.suppress(ProcessLookupError):
+            admin.terminate()
+        with contextlib.suppress(ProcessLookupError):
+            bridge.terminate()
+        loop.remove_signal_handler(signal.SIGINT)
+        loop.remove_signal_handler(signal.SIGTERM)
 
-    loop = asyncio.get_event_loop()
     loop.add_signal_handler(signal.SIGINT, terminate)
     loop.add_signal_handler(signal.SIGTERM, terminate)
 
@@ -238,7 +235,8 @@ def terminate():
             cmd,
             # Wait for the log message indicating that the bridge has been
             # added to the fabric.
-            f"Commissioning complete for node ID {bridge_node_id:#018x}: success")
+            f"Commissioning complete for node ID {bridge_node_id:#018x}: success",
+            timeout=30)
 
     # Open commissioning window with original setup code for the bridge.
     cw_endpoint_id = 0
@@ -250,18 +248,23 @@ def terminate():
                      f" {cw_option} {cw_timeout} {cw_iteration} {cw_discriminator}")
 
     try:
-        await asyncio.gather(
-            forward_pipe(pipe, admin.p.stdin) if pipe else forward_stdin(admin.p.stdin),
-            admin.wait(),
-            bridge.wait(),
-        )
-    except SystemExit:
-        admin.terminate()
-        bridge.terminate()
-    except Exception:
-        admin.terminate()
-        bridge.terminate()
-        raise
+        forward = forward_pipe(pipe, admin.p.stdin) if pipe else forward_stdin(admin.p.stdin)
+        # Wait for any of the tasks to complete.
+        _, pending = await asyncio.wait([
+            asyncio.create_task(admin.wait()),
+            asyncio.create_task(bridge.wait()),
+            asyncio.create_task(forward),
+        ], return_when=asyncio.FIRST_COMPLETED)
+        # Cancel the remaining tasks.
+        for task in pending:
+            task.cancel()
+    except Exception as e:
+        print(e, file=sys.stderr)
+
+    terminate()
+    # Make sure that we will not return until both processes are terminated.
+    await admin.wait()
+    await bridge.wait()
 
 
 if __name__ == "__main__":