Improved BlueToolFixup compatibility with macOS 12b10 (thx @dhinakg, @…

…williambj1) closes #16
acidanthera · Oct 22, 2021 · 44c3025 · 44c3025 · MaximeH38 · Oct 22, 2021
1 parent dd3df1a
commit 44c3025
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/BrcmPatchRAM.xcodeproj/project.pbxproj b/BrcmPatchRAM.xcodeproj/project.pbxproj
@@ -740,7 +740,7 @@
 		D4F91AF51A2998CE0030D10D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1300;
 				TargetAttributes = {
 					4C7783242526A08800DBB02E = {
 						CreatedOnToolsVersion = 12.0.1;

diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
@@ -50,7 +50,19 @@ bool BlueToolFixup::start(IOService *provider) {
 static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
 static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi";
 
-static const char *blueToolPath = "/usr/sbin/BlueTool";
+static const uint8_t kVendorCheckOriginal[] =
+{
+    0x81, 0xFA,     // cmp edx
+    0x5C, 0x0A, 0x00, 0x00,  // Vendor BRCM,
+    0x74 // jnz short
+};
+
+static const uint8_t kVendorCheckPatched[] =
+{
+    0x81, 0xFA,     // cmp edx
+    0x5C, 0x0A, 0x00, 0x00,  // Vendor BRCM,
+    0xEB // jmp short
+};
 
 static mach_vm_address_t orig_cs_validate {};
 
@@ -71,8 +83,12 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
     char path[PATH_MAX];
     int pathlen = PATH_MAX;
     FunctionCast(patched_cs_validate_page, orig_cs_validate)(vp, pager, page_offset, data, validated_p, tainted_p, nx_p);
-    if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) {
-        searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+    static constexpr size_t dirLength = sizeof("/usr/sbin/")-1;
+    if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strncmp(path, "/usr/sbin/", dirLength) == 0)) {
+        if (strcmp(path + dirLength, "BlueTool") == 0)
+            searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+        else if (strcmp(path + dirLength, "bluetoothd") == 0)
+            searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched);
     }
 }
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 BrcmPatchRAM Changelog
 ======================
+#### v2.6.1
+- Improved BlueToolFixup compatibility with macOS 12b10 (thx @dhinakg, @williambj1)
+
 #### v2.6.0
 - Added BlueToolFixup for macOS 12 compatibility