Merge "Revert "appop: protect mediaserver with OP_RECORD_AUDIO op check."" into cm-11.0 (a4125c86) · Commits · e / devices / smdk4412 / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+3 −72

Original line number	Diff line number	Diff line
		@@ -44,11 +44,9 @@
		#include <dirent.h>
		#include <math.h>
		#include <signal.h>
		#include <stdio.h>
		#include <sys/time.h>
		#include <sys/resource.h>

		#include <binder/AppOpsManager.h>
		#include <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>
		#include <utils/Log.h>
		@@ -109,6 +107,7 @@ namespace android {
		static const char kDeadlockedString[] = "AudioFlinger may be deadlocked\n";
		static const char kHardwareLockedString[] = "Hardware lock is taken\n";


		nsecs_t AudioFlinger::mStandbyTimeInNsecs = kDefaultStandbyTimeInNsecs;

		uint32_t AudioFlinger::mScreenState;
		@@ -129,19 +128,6 @@ static const nsecs_t kMinGlobalEffectEnabletimeNs = seconds(7200);

		// ----------------------------------------------------------------------------

		static int getprocname(pid_t pid, char *buf, size_t len)
		{
		char filename[20];
		FILE *f;

		sprintf(filename, "/proc/%d/cmdline", pid);
		f = fopen(filename, "r");
		if (!f) { *buf = '\0'; return 1; }
		if (!fgets(buf, len, f)) { *buf = '\0'; return 2; }
		fclose(f);
		return 0;
		}

		static int load_audio_interface(const char if_name, audio_hw_device_t *dev)
		{
		const hw_module_t *mod;
		@@ -451,12 +437,7 @@ sp<AudioFlinger::Client> AudioFlinger::registerPid_l(pid_t pid)
		// (for which promote() is always != 0), otherwise create a new entry and Client.
		sp<Client> client = mClients.valueFor(pid).promote();
		if (client == 0) {
		char process_name[40];
		if (getprocname(pid, process_name, sizeof(process_name)) == 0) {
		client = new Client(this, pid, String16((const char*) process_name));
		} else {
		client = new Client(this, pid, String16());
		}
		client = new Client(this, pid);
		mClients.add(pid, client);
		}

		@@ -519,13 +500,6 @@ sp<IAudioTrack> AudioFlinger::createTrack(
		status_t lStatus;
		int lSessionId;

		// Check client has audio record access
		if (!checkAudioRecordOp()){
		ALOGE("createTrack() permission denied for %d", tid);
		lStatus = PERMISSION_DENIED;
		goto Exit;
		}

		// client AudioTrack::set already implements AUDIO_STREAM_DEFAULT => AUDIO_STREAM_MUSIC,
		// but if someone uses binder directly they could bypass that and cause us to crash
		if (uint32_t(streamType) >= AUDIO_STREAM_CNT) {
		@@ -1494,14 +1468,12 @@ sp<AudioFlinger::PlaybackThread> AudioFlinger::getEffectThread_l(int sessionId,

		// ----------------------------------------------------------------------------

		AudioFlinger::Client::Client(const sp<AudioFlinger>& audioFlinger, pid_t pid,
		const String16 clientName)
		AudioFlinger::Client::Client(const sp<AudioFlinger>& audioFlinger, pid_t pid)
		: RefBase(),
		mAudioFlinger(audioFlinger),
		// FIXME should be a "k" constant not hard-coded, in .h or ro. property, see 4 lines below
		mMemoryDealer(new MemoryDealer(1024*1024, "AudioFlinger::Client")),
		mPid(pid),
		mClientName(clientName),
		mTimedTrackCount(0)
		{
		// 1 MB of address space is good for 32 tracks, 8 buffers each, 4 KB/buffer
		@@ -1599,13 +1571,6 @@ sp<IAudioRecord> AudioFlinger::openRecord(
		goto Exit;
		}

		// Check client has audio record access
		if (!checkAudioRecordOp()){
		ALOGE("openRecord() permission denied for %d", tid);
		lStatus = PERMISSION_DENIED;
		goto Exit;
		}

		#ifdef QCOM_DIRECTTRACK
		// Check that audio input stream accepts requested audio parameters
		inputBufferSize = getInputBufferSize(sampleRate, format, channelCount);
		@@ -3029,38 +2994,4 @@ status_t AudioFlinger::onTransact(
		return BnAudioFlinger::onTransact(code, data, reply, flags);
		}

		bool AudioFlinger::checkAudioRecordOp()
		{
		IPCThreadState* ipcState = IPCThreadState::self();
		pid_t pid = ipcState->getCallingPid();
		uid_t uid = ipcState->getCallingUid();
		char process_name[40];

		// Only affect to apps
		if (uid < AID_APP) {
		// Ignore
		return true;
		}

		String16 clientName;
		sp<Client> client = mClients.valueFor(pid).promote();
		if (client == 0) {
		char process_name[40];
		if (getprocname(pid, process_name, sizeof(process_name)) == 0) {
		clientName = String16((const char*) process_name);
		}
		} else {
		clientName = client->clientName();
		}

		if (clientName.size() <= 0) {
		// Ignore
		return true;
		}

		// check AppOp permission
		return (uid != AID_SYSTEM && (mAppOpsManager.noteOp(AppOpsManager::OP_RECORD_AUDIO, uid,
		clientName) == AppOpsManager::MODE_ALLOWED));
		}

		}; // namespace android

services/audioflinger/AudioFlinger.h

+1 −9

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		#include <utils/TypeHelpers.h>
		#include <utils/Vector.h>

		#include <binder/AppOpsManager.h>
		#include <binder/BinderService.h>
		#include <binder/MemoryDealer.h>

		@@ -364,12 +363,10 @@ private:
		// --- Client ---
		class Client : public RefBase {
		public:
		Client(const sp<AudioFlinger>& audioFlinger, pid_t pid,
		const String16 clientName);
		Client(const sp<AudioFlinger>& audioFlinger, pid_t pid);
		virtual ~Client();
		sp<MemoryDealer> heap() const;
		pid_t pid() const { return mPid; }
		String16 clientName() const { return mClientName; }
		sp<AudioFlinger> audioFlinger() const { return mAudioFlinger; }

		bool reserveTimedTrack();
		@@ -381,7 +378,6 @@ private:
		const sp<AudioFlinger> mAudioFlinger;
		const sp<MemoryDealer> mMemoryDealer;
		const pid_t mPid;
		const String16 mClientName;

		Mutex mTimedTrackLock;
		int mTimedTrackCount;
		@@ -835,10 +831,6 @@ private:
		bool mIsLowRamDevice;
		bool mIsDeviceTypeKnown;
		nsecs_t mGlobalEffectEnableTime; // when a global effect was last enabled

		// To check audio record access
		AppOpsManager mAppOpsManager;
		bool checkAudioRecordOp();
		};

		#undef INCLUDING_FROM_AUDIOFLINGER_H