Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-19 00:25:15 +00:00
committed by Android (Google) Code Review
parent a2bfc8ce91 0c4a21e4ea
commit 8a00254d27
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmds/statsd/src/StatsService.cpp
View File

@@ -266,7 +266,9 @@ status_t StatsService::onTransact(uint32_t code, const Parcel& data, Parcel* rep
IResultReceiver::asInterface(data.readStrongBinder());
err = command(in, out, err, args, resultReceiver);
resultReceiver->send(err);
if (resultReceiver != nullptr) {
resultReceiver->send(err);
}
return NO_ERROR;
}
default: { return BnStatsManager::onTransact(code, data, reply, flags); }
@@ -411,13 +413,20 @@ status_t StatsService::command(int in, int out, int err, Vector<String8>& args,
return cmd_trigger_active_config_broadcast(out, args);
}
if (!args[0].compare(String8("data-subscribe"))) {
if (mShellSubscriber == nullptr) {
mShellSubscriber = new ShellSubscriber(mUidMap, mPullerManager);
{
std::lock_guard<std::mutex> lock(mShellSubscriberMutex);
if (mShellSubscriber == nullptr) {
mShellSubscriber = new ShellSubscriber(mUidMap, mPullerManager);
}
}
int timeoutSec = -1;
if (argCount >= 2) {
timeoutSec = atoi(args[1].c_str());
}
if (resultReceiver == nullptr) {
ALOGI("Null resultReceiver given, no subscription will be started");
return UNEXPECTED_NULL;
}
mShellSubscriber->startNewSubscription(in, out, resultReceiver, timeoutSec);
return NO_ERROR;
}

4
cmds/statsd/src/StatsService.h
View File

@@ -432,6 +432,10 @@ private:
sp<ShellSubscriber> mShellSubscriber;
/**
* Mutex for setting the shell subscriber
*/
mutable mutex mShellSubscriberMutex;
std::shared_ptr<LogEventQueue> mEventQueue;
FRIEND_TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart);