Merge "resist umask changes, make dirs 0711"

nickkral · Android (Google) Code Review · commit c610a6bac76f · 2012-03-26T09:03:07.000-07:00
diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
@@ -332,12 +332,15 @@ int initialize_directories() {
         ret = 0;
         // Make the /data/user directory if necessary
         if (access(user_data_dir, R_OK) < 0) {
-            if (mkdir(user_data_dir, 0755) < 0) {
+            if (mkdir(user_data_dir, 0711) < 0) {
                 return -1;
             }
             if (chown(user_data_dir, AID_SYSTEM, AID_SYSTEM) < 0) {
                 return -1;
             }
+            if (chmod(user_data_dir, 0711) < 0) {
+                return -1;
+            }
         }
         // Make the /data/user/0 symlink to /data/data if necessary
         if (access(primary_data_dir, R_OK) < 0) {

Original file line number	Diff line number	Diff line change
`@@ -332,12 +332,15 @@ int initialize_directories() {`
`332`	`332`	`ret = 0;`
`333`	`333`	`// Make the /data/user directory if necessary`
`334`	`334`	`if (access(user_data_dir, R_OK) < 0) {`
`335`		`- if (mkdir(user_data_dir, 0755) < 0) {`
	`335`	`+ if (mkdir(user_data_dir, 0711) < 0) {`
`336`	`336`	`return -1;`
`337`	`337`	`}`
`338`	`338`	`if (chown(user_data_dir, AID_SYSTEM, AID_SYSTEM) < 0) {`
`339`	`339`	`return -1;`
`340`	`340`	`}`
	`341`	`+ if (chmod(user_data_dir, 0711) < 0) {`
	`342`	`+ return -1;`
	`343`	`+ }`
`341`	`344`	`}`
`342`	`345`	`// Make the /data/user/0 symlink to /data/data if necessary`
`343`	`346`	`if (access(primary_data_dir, R_OK) < 0) {`