commit c95f7466ff14c37a934df834bc551c8515b261da
author Atneya Nair <atneya@google.com> Mon Jul 15 16:34:43 2024 -0700
committer Atneya Nair <atneya@google.com> Thu Jul 18 00:34:43 2024 +0000
tree d5ad86065d08cfd07fedf1539b75b871b6743ab8
parent b0b97d5299314fd11000ee0426e0740af6e123aa

Auto-grant permission to root/system/self

Ensure that root gets all permissions for some native tests that still run as root.

Fast-path self/root/system-uid checks, since they should get all permission from our perspective.

Test: atest audiosystem_tests
Bug: 353253918
Bug: 338089555
Flag: com.android.media.audio.audioserver_permissions
Change-Id: I478fb7dcf031f10f4657a7909e2446f530c0549b

services/audiopolicy/permission/NativePermissionController.cpp

diff --git a/services/audiopolicy/permission/NativePermissionController.cpp b/services/audiopolicy/permission/NativePermissionController.cpp
index 8659f2c..07bb7e2 100644
--- a/services/audiopolicy/permission/NativePermissionController.cpp
+++ b/services/audiopolicy/permission/NativePermissionController.cpp
@@ -129,10 +129,12 @@
 
 BinderResult<bool> NativePermissionController::validateUidPackagePair(
         uid_t uid, const std::string& packageName) const {
+    if (uid == AID_ROOT || uid == AID_SYSTEM) return true;
     uid = uid % AID_USER_OFFSET;
     const auto fixed_package_opt = getFixedPackageName(uid);
     if (fixed_package_opt.has_value()) {
-        return packageName == fixed_package_opt.value();
+        return (uid == AID_ROOT || uid == AID_SYSTEM) ? true :
+                packageName == fixed_package_opt.value();
     }
     std::lock_guard l{m_};
     if (!is_package_populated_) {
@@ -148,6 +150,7 @@
 
 BinderResult<bool> NativePermissionController::checkPermission(PermissionEnum perm,
                                                                uid_t uid) const {
+    if (uid == AID_ROOT || uid == AID_SYSTEM || uid == getuid()) return true;
     std::lock_guard l{m_};
     const auto& uids = permission_map_[static_cast<size_t>(perm)];
     if (!uids.empty()) {