fix: terminate Android smoke daemons cleanly

Author: TheQmaks

scripts/android_smoke.py

@@ -656,19 +656,46 @@ def _exercise_gadget(
 
 
 def _cleanup(config: AndroidSmokeConfig, serial: str) -> None:
-    remote_server = f"{REMOTE_DIR}/{config.name}-server"
-    remote_loader = f"{REMOTE_DIR}/gadget-loader"
-    remote_processes = (remote_server, remote_loader)
+    processes = (
+        (f"{config.name}-server", f"{config.name}-server"[:15]),
+        ("gadget-loader", "gadget-loader"),
+    )
     failures: list[str] = []
+    signaled = False
 
-    for remote_process in remote_processes:
+    for label, process_comm in processes:
         result = root_shell(
             serial,
-            f"pkill -9 -f '^{remote_process}([[:space:]]|$)'",
+            f"pkill -TERM -x {process_comm}",
             check=False,
         )
+        signaled = signaled or result.returncode == 0
         if result.returncode not in (0, 1):
-            failures.append(f"stop {Path(remote_process).name} (exit {result.returncode})")
+            failures.append(f"stop {label} (exit {result.returncode})")
+
+    if signaled:
+        time.sleep(0.5)
+
+    forced: list[tuple[str, str]] = []
+    for label, process_comm in processes:
+        result = root_shell(serial, f"pgrep -x {process_comm}", check=False)
+        if result.returncode == 0:
+            forced.append((label, process_comm))
+            kill_result = root_shell(serial, f"pkill -KILL -x {process_comm}", check=False)
+            if kill_result.returncode not in (0, 1):
+                failures.append(f"force-stop {label} (exit {kill_result.returncode})")
+        elif result.returncode != 1:
+            failures.append(f"verify {label} (exit {result.returncode})")
+
+    if forced:
+        failures.append("processes did not stop gracefully: " + ", ".join(x[0] for x in forced))
+        time.sleep(0.2)
+        for label, process_comm in forced:
+            result = root_shell(serial, f"pgrep -x {process_comm}", check=False)
+            if result.returncode == 0:
+                failures.append(f"process remains: {label}")
+            elif result.returncode != 1:
+                failures.append(f"verify {label} after SIGKILL (exit {result.returncode})")
 
     remove_result = root_shell(serial, f"rm -rf -- {REMOTE_DIR}", check=False)
     if remove_result.returncode != 0:
@@ -677,21 +704,23 @@ def _cleanup(config: AndroidSmokeConfig, serial: str) -> None:
     for port in (config.port, choose_gadget_port(config.port)):
         adb(serial, "forward", "--remove", f"tcp:{port}", check=False)
 
-    for remote_process in remote_processes:
-        result = root_shell(
-            serial,
-            f"pgrep -f '^{remote_process}([[:space:]]|$)'",
-            check=False,
-        )
-        if result.returncode == 0:
-            failures.append(f"process remains: {Path(remote_process).name}")
-        elif result.returncode != 1:
-            failures.append(f"verify {Path(remote_process).name} (exit {result.returncode})")
-
     directory_result = root_shell(serial, f"test ! -e {REMOTE_DIR}", check=False)
     if directory_result.returncode != 0:
         failures.append("remote test directory remains")
 
+    socket_result = root_shell(serial, "cat /proc/net/unix", check=False)
+    if socket_result.returncode != 0:
+        failures.append(f"list unix sockets (exit {socket_result.returncode})")
+    else:
+        socket_markers = (
+            f"@{config.name}-server-",
+            f"@{config.name}-gadget-",
+            f"@/{config.name}-zymbiote-",
+        )
+        for marker in socket_markers:
+            if marker in socket_result.stdout:
+                failures.append(f"unix socket remains: {marker}")
+
     forward_result = adb(serial, "forward", "--list", check=False)
     if forward_result.returncode != 0:
         failures.append(f"list adb forwards (exit {forward_result.returncode})")

tests/test_android_smoke.py

@@ -561,6 +561,8 @@ def fake_adb(_serial: str, *arguments: str, **_kwargs: object) -> SimpleNamespac
 
     android_smoke._cleanup(config, "SERIAL-1")
 
+    assert "pkill -TERM -x oemcodec-server" in root_commands
+    assert "pkill -TERM -x gadget-loader" in root_commands
     assert "rm -rf -- /data/local/tmp/phantom-frida-test" in root_commands
     assert ("forward", "--list") in adb_commands
 
@@ -625,3 +627,50 @@ def fake_adb(_serial: str, *arguments: str, **_kwargs: object) -> SimpleNamespac
 
     with pytest.raises(android_smoke.SmokeFailure, match="forward remains"):
         android_smoke._cleanup(config, "SERIAL-1")
+
+
+def test_cleanup_rejects_lingering_runtime_socket(monkeypatch: pytest.MonkeyPatch) -> None:
+    def fake_root_shell(_serial: str, command: str, **_kwargs: object) -> SimpleNamespace:
+        stdout = "@/oemcodec-zymbiote-deadbeef\n" if command == "cat /proc/net/unix" else ""
+        return SimpleNamespace(
+            returncode=1 if command.startswith(("pkill", "pgrep")) else 0,
+            stdout=stdout,
+            stderr="",
+        )
+
+    monkeypatch.setattr(android_smoke, "root_shell", fake_root_shell)
+    monkeypatch.setattr(
+        android_smoke,
+        "adb",
+        lambda *_args, **_kwargs: SimpleNamespace(returncode=0, stdout="", stderr=""),
+    )
+    config = SimpleNamespace(name="oemcodec", port=27142)
+
+    with pytest.raises(android_smoke.SmokeFailure, match="unix socket remains"):
+        android_smoke._cleanup(config, "SERIAL-1")
+
+
+def test_cleanup_uses_kernel_comm_limit_for_long_server_name(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    root_commands: list[str] = []
+
+    def fake_root_shell(_serial: str, command: str, **_kwargs: object) -> SimpleNamespace:
+        root_commands.append(command)
+        return SimpleNamespace(
+            returncode=1 if command.startswith(("pkill", "pgrep")) else 0,
+            stdout="",
+            stderr="",
+        )
+
+    monkeypatch.setattr(android_smoke, "root_shell", fake_root_shell)
+    monkeypatch.setattr(
+        android_smoke,
+        "adb",
+        lambda *_args, **_kwargs: SimpleNamespace(returncode=0, stdout="", stderr=""),
+    )
+    config = SimpleNamespace(name="abcdefghijklmnopqrst", port=27142)
+
+    android_smoke._cleanup(config, "SERIAL-1")
+
+    assert "pkill -TERM -x abcdefghijklmno" in root_commands