AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Try to get SIP configuration via private syscall if possible

Browse Source 
The SIP configuration is not available through the NVRAM in all cases,
so we try to get it via the private syscall first, if we can, and then
skip the warning if we don't find it in NVRAM.

Pick-to: 6.2 6.3
Change-Id: I0866d06c329a3ac70bb1f23732d10aab13a4f9c1
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-05-20 11:43:40 +02:00
parent 4fe9374589
commit fa01e0bd71
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/kernel/qcore_mac.mm
View File

@ -29,6 +29,13 @@
#include "qvarlengtharray.h"
#include "private/qlocking_p.h"
#if !defined(QT_APPLE_NO_PRIVATE_APIS)
extern "C" {
typedef uint32_t csr_config_t;
extern int csr_get_active_config(csr_config_t *) __attribute__((weak_import));
}
#endif
QT_BEGIN_NAMESPACE
// --------------------------------------------------------------------------
@ -343,6 +350,12 @@ bool qt_mac_runningUnderRosetta()
std::optional<uint32_t> qt_mac_sipConfiguration()
{
static auto configuration = []() -> std::optional<uint32_t> {
#if !defined(QT_APPLE_NO_PRIVATE_APIS)
csr_config_t config;
if (csr_get_active_config && csr_get_active_config(&config) == 0)
return config;
#endif
QIOType<io_registry_entry_t> nvram = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/options");
if (!nvram) {
qWarning("Failed to locate NVRAM entry in IO registry");
@ -351,10 +364,8 @@ std::optional<uint32_t> qt_mac_sipConfiguration()
QCFType<CFTypeRef> csrConfig = IORegistryEntryCreateCFProperty(nvram,
CFSTR("csr-active-config"), kCFAllocatorDefault, IOOptionBits{});
if (!csrConfig) {
qWarning("Failed to locate SIP config in NVRAM");
return {};
}
if (!csrConfig)
return {}; // SIP config is not available
if (auto type = CFGetTypeID(csrConfig); type != CFDataGetTypeID()) {
qWarning() << "Unexpected SIP config type" << CFCopyTypeIDDescription(type);