commit f97e6e7dd452798e3016f4efca1113b34306af5b
author Jin Qian <jinqian@google.com> Wed Feb 22 17:17:49 2017 -0800
committer Jin Qian <jinqian@google.com> Mon Feb 27 12:52:04 2017 -0800
tree c19163a24222779dcdd3245eae467dac25f712af
parent 9f27c6985df2e2848d9b7a738321cb817685d1e2

storaged: reduce storaged privilege

Remove storaged from system group.
Let init set priority based on rc file.

Test: adb shell dumpsys storaged --force
Bug: 35323867
Change-Id: I9d893ec69d9cc34a9e24f47166384efd7ef4d9d2

storaged/main.cpp

diff --git a/storaged/main.cpp b/storaged/main.cpp
index f5a8f39..672f453 100644
--- a/storaged/main.cpp
+++ b/storaged/main.cpp
@@ -44,20 +44,6 @@
 
 storaged_t storaged;
 
-static int drop_privs() {
-    // privilege setting
-    struct sched_param param;
-    memset(&param, 0, sizeof(param));
-
-    if (set_sched_policy(0, SP_BACKGROUND) < 0) return -1;
-
-    if (sched_setscheduler((pid_t) 0, SCHED_BATCH, &param) < 0) return -1;
-
-    if (setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_BACKGROUND) < 0) return -1;
-
-    return 0;
-}
-
 // Function of storaged's main thread
 void* storaged_main(void* s) {
     storaged_t* storaged = (storaged_t*)s;
@@ -133,10 +119,6 @@
         if (fd_emmc < 0)
             fd_emmc = TEMP_FAILURE_RETRY(open(mmc0_ext_csd, O_RDONLY));
 
-        if (drop_privs() != 0) {
-            return -1;
-        }
-
         storaged.set_privileged_fds(fd_emmc);
 
         // Start the main thread of storaged

storaged/storaged.rc

diff --git a/storaged/storaged.rc b/storaged/storaged.rc
index bb7c623..a24c7fb 100644
--- a/storaged/storaged.rc
+++ b/storaged/storaged.rc
@@ -1,6 +1,7 @@
 service storaged /system/bin/storaged
     class main
+    priority 10
     file /d/mmc0/mmc0:0001/ext_csd r
     writepid /dev/cpuset/system-background/tasks
     user root
-    group system package_info
\ No newline at end of file
+    group package_info
\ No newline at end of file