xnu-4570.51.1.tar.gz

[apple/xnu.git] / iokit / Kernel / i386 / IOKeyStoreHelper.cpp

diff --git a/iokit/Kernel/i386/IOKeyStoreHelper.cpp b/iokit/Kernel/i386/IOKeyStoreHelper.cpp
index fb09d9c2e6ae0c8b246913231a92a040ae7b28cf..17ebea8021a19f461b8952585907c33c755d0ecd 100644 (file)
--- a/iokit/Kernel/i386/IOKeyStoreHelper.cpp
+++ b/iokit/Kernel/i386/IOKeyStoreHelper.cpp
@@ -47,6 +47,13 @@ IOGetBootKeyStoreData(void);
 void
 IOSetKeyStoreData(IOMemoryDescriptor * data);
 
 void
 IOSetKeyStoreData(IOMemoryDescriptor * data);
 

+// APFS
+static volatile UInt32 apfsKeyFetched = 0;
+static IOMemoryDescriptor* apfsKeyData = NULL;
+
+IOMemoryDescriptor* IOGetAPFSKeyStoreData();
+void IOSetAPFSKeyStoreData(IOMemoryDescriptor* data);
+

 __END_DECLS
 
 #if 1
 __END_DECLS
 
 #if 1


@@ -90,7 +97,7 @@ IOGetBootKeyStoreData(void)
   ranges.address = args->keyStoreDataStart;
   ranges.length = args->keyStoreDataSize;
 
   ranges.address = args->keyStoreDataStart;
   ranges.length = args->keyStoreDataSize;
 

-  options = kIODirectionInOut | kIOMemoryTypePhysical64;
+  options = kIODirectionInOut | kIOMemoryTypePhysical64 | kIOMemoryMapperNone;

   
   memoryDescriptor = IOMemoryDescriptor::withOptions(&ranges,
                                                     1,
   
   memoryDescriptor = IOMemoryDescriptor::withOptions(&ranges,
                                                     1,


@@ -102,3 +109,52 @@ IOGetBootKeyStoreData(void)
 
   return memoryDescriptor;
 }
 
   return memoryDescriptor;
 }

+
+// APFS volume key fetcher
+
+// Store in-memory key (could be used by IOHibernateDone)
+void
+IOSetAPFSKeyStoreData(IOMemoryDescriptor* data)
+{
+    // Do not allow re-fetching of the boot_args key by passing NULL here.
+    if (data != NULL)
+    {
+        apfsKeyData = data;
+        apfsKeyFetched = 0;
+    }
+}
+
+// Retrieve any key we may have (stored in boot_args or by Hibernate)
+IOMemoryDescriptor*
+IOGetAPFSKeyStoreData()
+{
+    // Check if someone got the key before us
+    if (!OSCompareAndSwap(0, 1, &apfsKeyFetched))
+        return NULL;
+
+    // Do we have in-memory key?
+    if (apfsKeyData)
+    {
+        IOMemoryDescriptor* data = apfsKeyData;
+        apfsKeyData = NULL;
+        return data;
+    }
+
+    // Looks like there was no in-memory key and it's the first call - try boot_args
+    boot_args* args = (boot_args*)PE_state.bootArgs;
+
+    DEBG("%s: data at address %u size %u\n", __func__, args->apfsDataStart, args->apfsDataSize);
+    if (args->apfsDataStart == 0)
+        return NULL;
+
+    // We have the key in the boot_args, create IOMemoryDescriptor for the blob
+    IOAddressRange ranges;
+    ranges.address = args->apfsDataStart;
+    ranges.length = args->apfsDataSize;
+
+    const IOOptionBits options = kIODirectionInOut | kIOMemoryTypePhysical64 | kIOMemoryMapperNone;
+
+    IOMemoryDescriptor* memoryDescriptor = IOMemoryDescriptor::withOptions(&ranges, 1, 0, NULL, options);
+    DEBG("%s: memory descriptor %p\n", __func__, memoryDescriptor);
+    return memoryDescriptor;
+}