commit 74b0d066c6f57866c12e2d35adbcba6512256ec3
author Maciej Żenczykowski <maze@google.com> Thu Apr 13 01:09:43 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Thu Apr 13 01:13:22 2023 +0000
tree 727edfc44a048424ad94f0979362cc0aa1f103bf
parent a0ea7471831e46597f9c0c695dc764798fecd050

clat: log if SIGKILL fails

This can fail on T due to lack of:
  https://android-review.googlesource.com/c/platform/system/sepolicy/+/2522976
  allow systemserver to sigkill clat

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I277213cff8dd4f2ce7ad5356e312c291da2c93eb

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index dbb12ee..19f2fb8 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -500,7 +500,9 @@
     if (ret == 0) {
         ALOGE("Failed to SIGTERM clatd pid=%d, try SIGKILL", pid);
         // TODO: fix that kill failed or waitpid doesn't return.
-        kill(pid, SIGKILL);
+        if (kill(pid, SIGKILL)) {
+            ALOGE("Failed to SIGKILL clatd pid=%d: %s", pid, strerror(errno));
+        }
         ret = waitpid(pid, &status, 0);
     }
     if (ret == -1) {