commit 1a31ed3f3f4be950b4f9559b2152d376a3dbfd6b
author Maciej Żenczykowski <maze@google.com> Thu Apr 20 08:21:01 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 08:21:01 2023 +0000
tree 6733e270bcdc3e98bf7dccaa258f8c9b9a1ff94e
parent 228a2b69904289895360ccbd7e65bba0d20ffc28
parent 58c63379060af5916b49c78235e6a01d1570dc14

Merge changes I69947ef2,Ie62454be,I756e4451,I437fe4cc,I850678bd, ...

* changes:
  sed -i -r 's@/[*] updatetime [*]/ false@NO_UPDATETIME@g' offload.c
  sed -i -r 's@/[*] updatetime [*]/ true@UPDATETIME@g' offload.c
  sed -i -r 's@/[*]ignore_on_user[*]/true@IGNORE_ON_USER@g' netd.c
  sed -i -r 's@/[*]ignore_on_user[*]/false@LOAD_ON_USER@g' netd.c
  sed -i -r 's@/[*]ignore_on_userdebug[*]/false@LOAD_ON_USERDEBUG@g' netd.c
  sed -i -r 's@/[*]ignore_on_eng[*]/false@LOAD_ON_ENG@g' netd.c
  sed -i -r 's@/[*] is_ethernet [*]/ false@RAWIP@g' offload.c
  sed -i -r 's@/[*] is_ethernet [*]/ true@ETHER@g' offload.c
  sed -i -r 's@/[*] downstream [*]/ true@DOWNSTREAM@g' offload.c
  sed -i -r 's@/[*] downstream [*]/ false@UPSTREAM@g' offload.c
  bpf_net_helpers: define some boolean constants

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 438963e..059b716 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -51,7 +51,9 @@
 
 namespace android {
 
-#define ALOGF(s ...) do { ALOGE(s); abort(); } while(0)
+static bool fatal = false;
+
+#define ALOGF(s ...) do { ALOGE(s); fatal = true; } while(0)
 
 enum verify { VERIFY_DIR, VERIFY_BIN, VERIFY_PROG, VERIFY_MAP_RO, VERIFY_MAP_RW };
 
@@ -115,11 +117,6 @@
     // Clat BPF was only mainlined during T.
     if (!modules::sdklevel::IsAtLeastT()) return;
 
-    // HACK: some old vendor kernels lack ~5.10 backport of 'bpffs selinux genfscon' support.
-    // This is *NOT* supported, but let's allow, at least for now, U+ GSI to boot on them.
-    // (without this hack pixel5 R vendor + U gsi breaks)
-    if (isGsiImage() && !bpf::isAtLeastKernelVersion(5, 10, 0)) return;
-
     V("/sys/fs/bpf", S_IFDIR|S_ISVTX|0777, ROOT, ROOT, "fs_bpf", DIR);
     V("/sys/fs/bpf/net_shared", S_IFDIR|S_ISVTX|0777, ROOT, ROOT, "fs_bpf_net_shared", DIR);
 
@@ -138,6 +135,15 @@
 
 #undef V2
 
+    // HACK: Some old vendor kernels lack ~5.10 backport of 'bpffs selinux genfscon' support.
+    // This is *NOT* supported, but let's allow, at least for now, U+ GSI to boot on them.
+    // (without this hack pixel5 R vendor + U gsi breaks)
+    if (isGsiImage() && !bpf::isAtLeastKernelVersion(5, 10, 0)) {
+        ALOGE("GSI with *BAD* pre-5.10 kernel lacking bpffs selinux genfscon support.");
+        return;
+    }
+
+    if (fatal) abort();
 }
 
 #undef V