commit 5997a651228f99c009af6f8d59cf4248744a5bd2
author Atneya Nair <atneya@google.com> Fri Jun 14 17:24:45 2024 -0700
committer Atneya Nair <atneya@google.com> Wed Jun 26 17:49:24 2024 -0700
tree 04ce6148feeafe9261cf1c4779c7788114298bf8
parent 87a63c5b7909f8a5e88b84c0ce0accb56c878874

Revert^2 "Migrate audioflinger package validation"

This reverts commit 55532058d87e0199c9ed95930d87a8c42f5dcf7e.

Reason for revert: incorrect original merge order lead to post-submit
failure.

Fixed callingPid overwritten during validation issue.

Bug: 338089555
Test: CtsMediaAudioTestCases
Test: CtsVoiceInteractionTestCases
Test: android.cts.statsdatom.voiceinteraction.HotwordDetectorKeyphraseTriggeredStatsTest
Flag: com.android.media.audio.audioserver_permissions
Change-Id: I29be398869e2074c12fc23f38178fd82686461de

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 5c0ca5e..228eaf6 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -72,6 +72,7 @@
 #include <media/nbaio/Pipe.h>
 #include <media/nbaio/PipeReader.h>
 #include <media/nbaio/SourceAudioBufferProvider.h>
+#include <media/ValidatedAttributionSourceState.h>
 #include <mediautils/BatteryNotifier.h>
 #include <mediautils/Process.h>
 #include <mediautils/SchedulingPolicyService.h>
@@ -120,6 +121,8 @@
     return a < b ? a : b;
 }
 
+using com::android::media::permission::ValidatedAttributionSourceState;
+
 namespace android {
 
 using audioflinger::SyncEvent;
@@ -10298,8 +10301,23 @@
     audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;
 
     audio_io_handle_t io = mId;
-    const AttributionSourceState adjAttributionSource = afutils::checkAttributionSourcePackage(
-            client.attributionSource);
+    AttributionSourceState adjAttributionSource;
+    if (!com::android::media::audio::audioserver_permissions()) {
+        adjAttributionSource = afutils::checkAttributionSourcePackage(
+                client.attributionSource);
+    } else {
+        // TODO(b/342475009) validate in oboeservice, and plumb downwards
+        auto validatedRes = ValidatedAttributionSourceState::createFromTrustedUidNoPackage(
+                    client.attributionSource,
+                    mAfThreadCallback->getPermissionProvider()
+                );
+        if (!validatedRes.has_value()) {
+            ALOGE("MMAP client package validation fail: %s",
+                    validatedRes.error().toString8().c_str());
+            return aidl_utils::statusTFromBinderStatus(validatedRes.error());
+        }
+        adjAttributionSource = std::move(validatedRes.value()).unwrapInto();
+    }
 
     const auto localSessionId = mSessionId;
     auto localAttr = mAttr;