commit c8b78c708cb0f0f9e2aae8419a1fd09b191c16cf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Feb 11 13:26:40 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 11 13:26:40 2025 -0800
tree 052039639ccbc8c5ab7a636bdd6a5684b7db12aa
parent f776b75eb685917917956b5f5ccadef7a81102a5
parent 622633e7fee0a20f1c2ce1ddabce76b5b9ef74e7

Merge "Fix new adb remount/overlayfs solution for older kernels" into main

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 275bc80..a30d9c0 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -2336,10 +2336,6 @@
         return {.supported = false};
     }
 
-    if (!use_override_creds) {
-        return {.supported = true, ",userxattr"};
-    }
-
     struct utsname uts;
     if (uname(&uts) == -1) {
         return {.supported = false};
@@ -2348,6 +2344,14 @@
     if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) {
         return {.supported = false};
     }
+
+    if (!use_override_creds) {
+        if (major > 5 || (major == 5 && minor >= 15)) {
+            return {.supported = true, ",userxattr"};
+        }
+        return {.supported = true};
+    }
+
     // Overlayfs available in the kernel, and patched for override_creds?
     if (access("/sys/module/overlay/parameters/override_creds", F_OK) == 0) {
         auto mount_flags = ",override_creds=off"s;