revert fsldr change, fix null deref in pm

sysmodules/rosalina/source/main.c

@@ -37,6 +37,39 @@
 #include "menus/miscellaneous.h"
 #include "menus/screen_filters.h"
 
+static Result stealFsReg(void)
+{
+    Result ret = 0;
+
+    ret = svcControlService(SERVICEOP_STEAL_CLIENT_SESSION, fsRegGetSessionHandle(), "fs:REG");
+    while(ret == 0x9401BFE)
+    {
+        svcSleepThread(500 * 1000LL);
+        ret = svcControlService(SERVICEOP_STEAL_CLIENT_SESSION, fsRegGetSessionHandle(), "fs:REG");
+    }
+
+    return ret;
+}
+
+static Result fsRegSetupPermissions(void)
+{
+    u32 pid;
+    Result res;
+    FS_ProgramInfo info;
+
+    ExHeader_Arm11StorageInfo storageInfo = {
+        .fs_access_info = FSACCESS_NANDRO_RW | FSACCESS_NANDRW | FSACCESS_SDMC_RW,
+    };
+
+    info.programId = 0x0004013000006902LL; // Rosalina TID
+    info.mediaType = MEDIATYPE_NAND;
+
+    if(R_SUCCEEDED(res = svcGetProcessId(&pid, CUR_PROCESS_HANDLE)))
+        res = FSREG_Register(pid, 0xFFFF000000000000LL, &info, &storageInfo);
+
+    return res;
+}
+
 // this is called before main
 bool isN3DS;
 void __appInit()
@@ -49,12 +82,7 @@ void __appInit()
             svcBreak(USERBREAK_PANIC);
     }
 
-    // Wait for pm to call fs:REG Register on us
-    bool registered = false;
-    while (srvIsServiceRegistered(&registered, "pm:app"), registered)
-        svcSleepThread(500 * 1000LL);
-
-    if (R_FAILED(fsInit()))
+    if (R_FAILED(stealFsReg()) || R_FAILED(fsRegSetupPermissions()) || R_FAILED(fsInit()))
         svcBreak(USERBREAK_PANIC);
 }