Commit: 1576854573b0ee5525f4a3476d0f58d2f45eeae1 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Révision: 1576854573b0ee5525f4a3476d0f58d2f45eeae1 (tree)
• l'heure: 2016-07-26 19:04:16
• Auteur: Steve Kondik <steve@cyng...>
• Commiter: Steve Kondik

Message de Log

sdcard: Pass the umask to sdcardfs correctly

• Google version of the kernel code expects unsigned int rather than
  
  1. Don't confuse it.
     

Change-Id: I40f060dc5212ec587e612dc275001e1a660cce67

Change Summary

• modified: sdcard/sdcard.c

Modification

--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1792,7 +1792,7 @@ static int fuse_setup(struct fuse* fuse, gid_t gid, mode_t mask, bool use_sdcard
 
     if (use_sdcardfs) {
         snprintf(opts, sizeof(opts),
-                "%sfsuid=%d,fsgid=%d,userid=%d,gid=%d,mask=%04o,reserved_mb=20",
+                "%sfsuid=%u,fsgid=%u,userid=%d,gid=%u,mask=%u,reserved_mb=20",
                 (fuse->global->multi_user ? "multiuser," : ""),
                 fuse->global->uid, fuse->global->gid,
                 fuse->global->root.userid, gid, mask);
@@ -1909,11 +1909,6 @@ static void run(const char* source_path, const char* label, uid_t uid,
         }
     }
 
-    // Nothing else for us to do if sdcardfs is in use!
-    if (use_sdcardfs) {
-        exit(0);
-    }
-
     /* Drop privs */
     if (setgroups(sizeof(kGroups) / sizeof(kGroups[0]), kGroups) < 0) {
         ERROR("cannot setgroups: %s\n", strerror(errno));
@@ -1932,6 +1927,11 @@ static void run(const char* source_path, const char* label, uid_t uid,
         fs_prepare_dir(global.obb_path, 0775, uid, gid);
     }
 
+    // Nothing else for us to do if sdcardfs is in use!
+    if (use_sdcardfs) {
+        exit(0);
+    }
+
     if (pthread_create(&thread_default, NULL, start_handler, &handler_default)
             || pthread_create(&thread_read, NULL, start_handler, &handler_read)
             || pthread_create(&thread_write, NULL, start_handler, &handler_write)) {