valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes a small data race in disk arbitration (#3841)

Browse Source
This commit is contained in:
Mitchell Grenier 2017-10-16 17:55:11 -07:00 committed by Teddy Reed
parent 676430b019
commit 9ab7233f7e
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osquery/events/darwin/diskarbitration.cpp
View File

@ -31,13 +31,10 @@ const std::string kIOHIDXClassPath{"IOService:/IOResources/IOHDIXController/"};
REGISTER(DiskArbitrationEventPublisher, "event_publisher", "diskarbitration");
void DiskArbitrationEventPublisher::restart() {
if (run_loop_ == nullptr) {
return;
}
stop();
WriteLock lock(mutex_);
run_loop_ = CFRunLoopGetCurrent();
session_ = DASessionCreate(kCFAllocatorDefault);
DARegisterDiskAppearedCallback(
session_,
@ -54,33 +51,29 @@ void DiskArbitrationEventPublisher::restart() {
}
Status DiskArbitrationEventPublisher::run() {
if (run_loop_ == nullptr) {
run_loop_ = CFRunLoopGetCurrent();
restart();
}
restart();
CFRunLoopRun();
return Status(0, "OK");
}
void DiskArbitrationEventPublisher::stop() {
WriteLock lock(mutex_);
if (run_loop_ == nullptr) {
return;
}
WriteLock lock(mutex_);
if (session_ != nullptr) {
DASessionUnscheduleFromRunLoop(session_, run_loop_, kCFRunLoopDefaultMode);
CFRelease(session_);
session_ = nullptr;
}
CFRunLoopStop(run_loop_);
run_loop_ = nullptr;
}
void DiskArbitrationEventPublisher::tearDown() {
stop();
run_loop_ = nullptr;
}
void DiskArbitrationEventPublisher::DiskAppearedCallback(DADiskRef disk,