aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Aitor Esteve Alvarado <aesteve@singularaircraft.com>2019-03-07 10:14:48 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2019-06-09 13:47:49 +0200
commit7b6d4f50c97b4f375687e8216313b10598b44b49 (patch)
treef456b0c66da297ed134d9cbbdf9dda148ca0fdfd
parent894f0a32351fe6c28fe86958e5f4e21422394183 (diff)
downloadbusybox-7b6d4f50c97b4f375687e8216313b10598b44b49.tar.gz
busybox-7b6d4f50c97b4f375687e8216313b10598b44b49.tar.bz2
start-stop-daemon: change priority before dropping privileges
Currently start-stop-daemon fails when using both the -c option (set uid) and -N option (set niceness/priority) as it first drops privileges and then tries to increase the priority. This patch changes the order of execution. Signed-off-by: Aitor Esteve Alvarado <aesteve@singularaircraft.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--debianutils/start_stop_daemon.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 72642ae74..6fbf8b6de 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -537,6 +537,15 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
/* User wants _us_ to make the pidfile */
write_pidfile(pidfile);
}
+#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+ if (opt & OPT_NICELEVEL) {
+ /* Set process priority (must be before OPT_c) */
+ int prio = getpriority(PRIO_PROCESS, 0) + xatoi_range(opt_N, INT_MIN/2, INT_MAX/2);
+ if (setpriority(PRIO_PROCESS, 0, prio) < 0) {
+ bb_perror_msg_and_die("setpriority(%d)", prio);
+ }
+ }
+#endif
if (opt & OPT_c) {
struct bb_uidgid_t ugid;
parse_chown_usergroup_or_die(&ugid, chuid);
@@ -551,15 +560,6 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
setgroups(1, &ugid.gid);
}
}
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
- if (opt & OPT_NICELEVEL) {
- /* Set process priority */
- int prio = getpriority(PRIO_PROCESS, 0) + xatoi_range(opt_N, INT_MIN/2, INT_MAX/2);
- if (setpriority(PRIO_PROCESS, 0, prio) < 0) {
- bb_perror_msg_and_die("setpriority(%d)", prio);
- }
- }
-#endif
/* Try:
* strace -oLOG start-stop-daemon -S -x /bin/usleep -a qwerty 500000
* should exec "/bin/usleep", but argv[0] should be "qwerty":