[automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 (2b9a4223) · Commits · e / os / android_frameworks_av

include/media/MediaPlayerInterface.h

+17 −15

Original line number	Diff line number	Diff line
		@@ -65,14 +65,17 @@ enum player_type {
		// duration below which we do not allow deep audio buffering
		#define AUDIO_SINK_MIN_DEEP_BUFFER_DURATION_US 5000000

		// callback mechanism for passing messages to MediaPlayer object
		typedef void (notify_callback_f)(void cookie,
		int msg, int ext1, int ext2, const Parcel *obj);

		// abstract base class - use MediaPlayerInterface
		class MediaPlayerBase : public RefBase
		{
		public:
		// callback mechanism for passing messages to MediaPlayer object
		class Listener : public RefBase {
		public:
		virtual void notify(int msg, int ext1, int ext2, const Parcel *obj) = 0;
		virtual ~Listener() {}
		};

		// AudioSink: abstraction layer for audio output
		class AudioSink : public RefBase {
		public:
		@@ -144,7 +147,7 @@ public:
		virtual String8 getParameters(const String8& /* keys */) { return String8::empty(); }
		};

		MediaPlayerBase() : mCookie(0), mNotify(0) {}
		MediaPlayerBase() {}
		virtual ~MediaPlayerBase() {}
		virtual status_t initCheck() = 0;
		virtual bool hardwareOutput() = 0;
		@@ -245,22 +248,22 @@ public:
		};

		void setNotifyCallback(
		void* cookie, notify_callback_f notifyFunc) {
		const sp<Listener> &listener) {
		Mutex::Autolock autoLock(mNotifyLock);
		mCookie = cookie; mNotify = notifyFunc;
		mListener = listener;
		}

		void sendEvent(int msg, int ext1=0, int ext2=0,
		const Parcel *obj=NULL) {
		notify_callback_f notifyCB;
		void* cookie;
		sp<Listener> listener;
		{
		Mutex::Autolock autoLock(mNotifyLock);
		notifyCB = mNotify;
		cookie = mCookie;
		listener = mListener;
		}

		if (notifyCB) notifyCB(cookie, msg, ext1, ext2, obj);
		if (listener != NULL) {
		listener->notify(msg, ext1, ext2, obj);
		}
		}

		virtual status_t dump(int /* fd /, const Vector<String16>& / args */) const {
		@@ -271,8 +274,7 @@ private:
		friend class MediaPlayerService;

		Mutex mNotifyLock;
		void* mCookie;
		notify_callback_f mNotify;
		sp<Listener> mListener;
		};

		// Implement this class for media players that use the AudioFlinger software mixer

media/libmediaplayerservice/MediaPlayerFactory.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -134,8 +134,7 @@ player_type MediaPlayerFactory::getPlayerType(const sp<IMediaPlayer>& client,

		sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(
		player_type playerType,
		void* cookie,
		notify_callback_f notifyFunc,
		const sp<MediaPlayerBase::Listener> &listener,
		pid_t pid) {
		sp<MediaPlayerBase> p;
		IFactory* factory;
		@@ -160,7 +159,7 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(

		init_result = p->initCheck();
		if (init_result == NO_ERROR) {
		p->setNotifyCallback(cookie, notifyFunc);
		p->setNotifyCallback(listener);
		} else {
		ALOGE("Failed to create player object of type %d, initCheck failed"
		" (res = %d)", playerType, init_result);

media/libmediaplayerservice/MediaPlayerFactory.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -65,8 +65,7 @@ class MediaPlayerFactory {
		const sp<DataSource> &source);

		static sp<MediaPlayerBase> createPlayer(player_type playerType,
		void* cookie,
		notify_callback_f notifyFunc,
		const sp<MediaPlayerBase::Listener> &listener,
		pid_t pid);

		static void registerBuiltinFactories();

media/libmediaplayerservice/MediaPlayerService.cpp

+18 −22

Original line number	Diff line number	Diff line
		@@ -604,10 +604,11 @@ MediaPlayerService::Client::Client(
		mUID = uid;
		mRetransmitEndpointValid = false;
		mAudioAttributes = NULL;
		mListener = new Listener(this);

		#if CALLBACK_ANTAGONIZER
		ALOGD("create Antagonizer");
		mAntagonizer = new Antagonizer(notify, this);
		mAntagonizer = new Antagonizer(mListener);
		#endif
		}

		@@ -643,7 +644,7 @@ void MediaPlayerService::Client::disconnect()
		// and reset the player. We assume the player will serialize
		// access to itself if necessary.
		if (p != 0) {
		p->setNotifyCallback(0, 0);
		p->setNotifyCallback(0);
		#if CALLBACK_ANTAGONIZER
		ALOGD("kill Antagonizer");
		mAntagonizer->kill();
		@@ -665,7 +666,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::createPlayer(player_type playerT
		p.clear();
		}
		if (p == NULL) {
		p = MediaPlayerFactory::createPlayer(playerType, this, notify, mPid);
		p = MediaPlayerFactory::createPlayer(playerType, mListener, mPid);
		}

		if (p != NULL) {
		@@ -1272,22 +1273,17 @@ status_t MediaPlayerService::Client::getRetransmitEndpoint(
		}

		void MediaPlayerService::Client::notify(
		void* cookie, int msg, int ext1, int ext2, const Parcel *obj)
		int msg, int ext1, int ext2, const Parcel *obj)
		{
		Client* client = static_cast<Client*>(cookie);
		if (client == NULL) {
		return;
		}

		sp<IMediaPlayerClient> c;
		{
		Mutex::Autolock l(client->mLock);
		c = client->mClient;
		if (msg == MEDIA_PLAYBACK_COMPLETE && client->mNextClient != NULL) {
		if (client->mAudioOutput != NULL)
		client->mAudioOutput->switchToNextOutput();
		client->mNextClient->start();
		client->mNextClient->mClient->notify(MEDIA_INFO, MEDIA_INFO_STARTED_AS_NEXT, 0, obj);
		Mutex::Autolock l(mLock);
		c = mClient;
		if (msg == MEDIA_PLAYBACK_COMPLETE && mNextClient != NULL) {
		if (mAudioOutput != NULL)
		mAudioOutput->switchToNextOutput();
		mNextClient->start();
		mNextClient->mClient->notify(MEDIA_INFO, MEDIA_INFO_STARTED_AS_NEXT, 0, obj);
		}
		}

		@@ -1295,17 +1291,17 @@ void MediaPlayerService::Client::notify(
		MEDIA_INFO_METADATA_UPDATE == ext1) {
		const media::Metadata::Type metadata_type = ext2;

		if(client->shouldDropMetadata(metadata_type)) {
		if(shouldDropMetadata(metadata_type)) {
		return;
		}

		// Update the list of metadata that have changed. getMetadata
		// also access mMetadataUpdated and clears it.
		client->addNewMetadataUpdate(metadata_type);
		addNewMetadataUpdate(metadata_type);
		}

		if (c != NULL) {
		ALOGV("[%d] notify (%p, %d, %d, %d)", client->mConnId, cookie, msg, ext1, ext2);
		ALOGV("[%d] notify (%d, %d, %d)", mConnId, msg, ext1, ext2);
		c->notify(msg, ext1, ext2, obj);
		}
		}
		@@ -1337,8 +1333,8 @@ void MediaPlayerService::Client::addNewMetadataUpdate(media::Metadata::Type meta
		#if CALLBACK_ANTAGONIZER
		const int Antagonizer::interval = 10000; // 10 msecs

		Antagonizer::Antagonizer(notify_callback_f cb, void* client) :
		mExit(false), mActive(false), mClient(client), mCb(cb)
		Antagonizer::Antagonizer(const sp<MediaPlayerBase::Listener> &listener) :
		mExit(false), mActive(false), mListener(listener)
		{
		createThread(callbackThread, this);
		}
		@@ -1358,7 +1354,7 @@ int Antagonizer::callbackThread(void* user)
		while (!p->mExit) {
		if (p->mActive) {
		ALOGV("send event");
		p->mCb(p->mClient, 0, 0, 0);
		p->mListener->notify(0, 0, 0, 0);
		}
		usleep(interval);
		}

media/libmediaplayerservice/MediaPlayerService.h

+40 −28

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ class MediaRecorderClient;
		#if CALLBACK_ANTAGONIZER
		class Antagonizer {
		public:
		Antagonizer(notify_callback_f cb, void* client);
		Antagonizer(const sp<MediaPlayerBase::Listener> &listener);
		void start() { mActive = true; }
		void stop() { mActive = false; }
		void kill();
		@@ -61,8 +61,7 @@ private:
		Condition mCondition;
		bool mExit;
		bool mActive;
		void* mClient;
		notify_callback_f mCb;
		sp<MediaPlayerBase::Listener> mListener;
		};
		#endif

		@@ -204,7 +203,6 @@ class MediaPlayerService : public BnMediaPlayerService

		}; // AudioOutput


		public:
		static void instantiate();

		@@ -326,8 +324,7 @@ private:
		void setDataSource_post(const sp<MediaPlayerBase>& p,
		status_t status);

		static void notify(void* cookie, int msg,
		int ext1, int ext2, const Parcel *obj);
		void notify(int msg, int ext1, int ext2, const Parcel *obj);

		pid_t pid() const { return mPid; }
		virtual status_t dump(int fd, const Vector<String16>& args);
		@@ -366,6 +363,20 @@ private:

		status_t setAudioAttributes_l(const Parcel &request);

		class Listener : public MediaPlayerBase::Listener {
		public:
		Listener(const wp<Client> &client) : mClient(client) {}
		virtual ~Listener() {}
		virtual void notify(int msg, int ext1, int ext2, const Parcel *obj) {
		sp<Client> client = mClient.promote();
		if (client != NULL) {
		client->notify(msg, ext1, ext2, obj);
		}
		}
		private:
		wp<Client> mClient;
		};

		mutable Mutex mLock;
		sp<MediaPlayerBase> mPlayer;
		sp<MediaPlayerService> mService;
		@@ -383,6 +394,7 @@ private:
		struct sockaddr_in mRetransmitEndpoint;
		bool mRetransmitEndpointValid;
		sp<Client> mNextClient;
		sp<MediaPlayerBase::Listener> mListener;

		// Metadata filters.
		media::Metadata::Filter mMetadataAllow; // protected by mLock