From bbbd18a71368a80f689b924dcf82062c2ee351b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 2 May 2023 09:24:56 +0000 Subject: [PATCH] drop support for V gsi on pixel 5 R base kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will fail 'boot_test_rvc_pixel5' due to the pixel 5 RVC image's 4.19 kernel failing U VTS (and indeed likely even earlier and other xTS tests as well), due to not including: https://android-review.git.corp.google.com/c/kernel/common/+/1881533 UPSTREAM: security: selinux: allow per-file labeling for bpffs Additionally expecting us to support 4 OS upgrades (R->S->T->U->V) is simply unreasonable. Bug: 258879079 Bug: 280411222 Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I8f5009e772a0efbb0401ad466c0405e53a172ce6 --- ..._android_server_connectivity_ClatCoordinator.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp index 8d909edb02..d966070f47 100644 --- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp +++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp @@ -90,11 +90,6 @@ static void verifyPerms(const char * const path, #undef ALOGF -bool isGsiImage() { - // this implementation matches 2 other places in the codebase (same function name too) - return !access("/system/system_ext/etc/init/init.gsi.rc", F_OK); -} - static const char* kClatdDir = "/apex/com.android.tethering/bin/for-system"; static const char* kClatdBin = "/apex/com.android.tethering/bin/for-system/clatd"; @@ -135,14 +130,6 @@ static void verifyClatPerms() { #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(); }