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

Fixed over release of object on osx (#4404)

Browse Source
This commit is contained in:
Max Kareta 2018-05-22 13:07:43 +01:00 committed by GitHub
parent bf82fca620
commit b92b8a078a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
osquery/tables/system/darwin/disk_encryption.mm
View File

@ -234,48 +234,24 @@ void genFDEStatusForAPFS(Row& r) {
CFRelease(bundle);
};
// err = [apfs isEncryptedVolume:targetVol encrypted:&isEncrypted];
char* typeEncodings = nullptr;
asprintf(&typeEncodings,
"%s%s%s%s%s",
@encode(int), // return
@encode(id), // self
@encode(SEL), // _cmd
@encode(DADiskRef),
@encode(char*));
if (typeEncodings == nullptr) {
LOG(ERROR) << "asprintf returned nullptr for typeEncodings";
cleanup();
return;
}
NSMethodSignature* signature =
[NSMethodSignature signatureWithObjCTypes:typeEncodings];
free(typeEncodings);
if (signature == nullptr) {
LOG(ERROR) << "Got null NSMethodSignature";
cleanup();
return;
}
char isEncrypted = 0;
char* isEncryptedPtr = &isEncrypted;
int err = 0;
char isEncrypted = 0;
// err = [apfs isEncryptedVolume:targetVol encrypted:&isEncrypted];
@try {
NSInvocation* inv = [NSInvocation invocationWithMethodSignature:signature];
if (inv == nullptr) {
LOG(ERROR)
<< "Failed to create NSInvocation for isEncryptedVolume:encrypted:";
SEL selector = @selector(isEncryptedVolume:encrypted:);
IMP methodIMP = [apfs methodForSelector:selector];
if (methodIMP == nullptr) {
LOG(ERROR) << "Failed to get method IMP for isEncryptedVolume:encrypted:";
cleanup();
return;
}
[inv setSelector:@selector(isEncryptedVolume:encrypted:)];
[inv setReturnValue:&err];
[inv setArgument:&targetVol atIndex:2];
[inv setArgument:&isEncryptedPtr atIndex:3];
[inv invokeWithTarget:apfs];
int (*function)(id, SEL, DADiskRef, char*) =
(int (*)(id, SEL, DADiskRef, char*))(methodIMP);
err = function(apfs, selector, targetVol, &isEncrypted);
} @catch (NSException* exception) {
LOG(ERROR) << "NSInvocation threw for isEncryptedVolume:encrypted:";
LOG(ERROR) << "isEncryptedVolume:encrypted: threw exception "
<< exception.name;
cleanup();
return;
}
@ -286,44 +262,21 @@ void genFDEStatusForAPFS(Row& r) {
}
// err = [apfs cryptoUsersForVolume:targetVol users:&cryptoUsers];
typeEncodings = nullptr;
asprintf(&typeEncodings,
"%s%s%s%s%s",
@encode(int), // return
@encode(id), // self
@encode(SEL), // _cmd
@encode(DADiskRef),
@encode(void*));
if (typeEncodings == nullptr) {
LOG(ERROR) << "asprintf returned nullptr for typeEncodings";
cleanup();
return;
}
signature = [NSMethodSignature signatureWithObjCTypes:typeEncodings];
free(typeEncodings);
if (signature == nullptr) {
LOG(ERROR) << "Got null NSMethodSignature";
cleanup();
return;
}
NSArray* cryptoUsers = nullptr;
void* cryptoUsersPtr = &cryptoUsers;
@try {
NSInvocation* inv = [NSInvocation invocationWithMethodSignature:signature];
if (inv == nullptr) {
LOG(ERROR)
<< "Failed to create NSInvocation for cryptoUsersForVolume:users:";
SEL selector = @selector(cryptoUsersForVolume:users:);
IMP methodIMP = [apfs methodForSelector:selector];
if (methodIMP == nullptr) {
LOG(ERROR) << "Failed to get method IMP for cryptoUsersForVolume:users:";
cleanup();
return;
}
[inv setSelector:@selector(cryptoUsersForVolume:users:)];
[inv setReturnValue:&err];
[inv setArgument:&targetVol atIndex:2];
[inv setArgument:&cryptoUsersPtr atIndex:3];
[inv invokeWithTarget:apfs];
int (*function)(id, SEL, DADiskRef, id*) =
(int (*)(id, SEL, DADiskRef, id __autoreleasing*))(methodIMP);
err = function(apfs, selector, targetVol, &cryptoUsers);
} @catch (NSException* exception) {
LOG(ERROR) << "NSInvocation threw for cryptoUsersForVolume:users:";
LOG(ERROR) << "cryptoUsersForVolume:users: threw exception "
<< exception.name;
cleanup();
return;
}
@ -332,7 +285,7 @@ void genFDEStatusForAPFS(Row& r) {
cleanup();
if (err != 0) {
LOG(ERROR) << "Error calling cryptoUsersForVolume:users:";
LOG(ERROR) << "Error calling cryptoUsersForVolume:users: ";
return;
}