commit 990635c6c043ab451aaac4138159a4e4e4e69b25
author Maciej Żenczykowski <maze@google.com> Wed Jul 27 08:04:33 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Mon Aug 08 10:04:53 2022 +0000
tree c11d776157ab96d952eff52c2f53c641f6396fad
parent a81f1251dd41741e7c388732df58c37122bb94a7

fail *hard* if TrafficController::start() fails

Hitting this abort() likely means map initialization failed,
and basically things won't work correctly.

Another possibility detected on wembley is a kernel bpf bug
which prevents writes into index != 0 of bpf array maps.

But such a kernel bug will make TC useless.
Best to abort() and cause a mainline module rollback.

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

service/jni/com_android_server_BpfNetMaps.cpp

diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp
index 49392e0..2b4bc37 100644
--- a/service/jni/com_android_server_BpfNetMaps.cpp
+++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -26,6 +26,8 @@
 #include <nativehelper/ScopedPrimitiveArray.h>
 #include <netjniutils/netjniutils.h>
 #include <net/if.h>
+#include <private/android_filesystem_config.h>
+#include <unistd.h>
 #include <vector>
 
 
@@ -48,6 +50,12 @@
 static void native_init(JNIEnv* env, jclass clazz) {
   Status status = mTc.start();
   CHECK_LOG(status);
+  if (!isOk(status)) {
+    uid_t uid = getuid();
+    ALOGE("BpfNetMaps jni init failure as uid=%d", uid);
+    // TODO: Fix tests to not use this jni lib, so we can unconditionally abort()
+    if (uid == AID_SYSTEM || uid == AID_NETWORK_STACK) abort();
+  }
 }
 
 static jint native_addNaughtyApp(JNIEnv* env, jobject self, jint uid) {