aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-05 01:42:08 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-05 01:42:08 +0200
commita453ca576fba45849784322681a4515bdab9ceab (patch)
treed13efb9b8319839b66d29e2609c18d5c8d476054
parent754e9f96defd7be48dfdc9ffe820c3fb7f35ff9e (diff)
downloadbusybox-a453ca576fba45849784322681a4515bdab9ceab.tar.gz
sv, svc: make them NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--NOFORK_NOEXEC.lst4
-rw-r--r--runit/sv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index b2f410177..f6cc548d2 100644
--- a/NOFORK_NOEXEC.lst
+++ b/NOFORK_NOEXEC.lst
@@ -334,8 +334,8 @@ stty - noexec. nofork candidate: has no allocs or opens except xmove_fd(xopen("-
su - suid, spawner
sulogin - noexec. spawner
sum - runner
-sv - noexec candidate, needs ^C (uses usleep(420000))
-svc - noexec candidate, needs ^C (uses usleep(420000))
+sv - noexec. needs ^C (uses usleep(420000))
+svc - noexec. needs ^C (uses usleep(420000))
svlogd - daemon
swapoff - rare
swapon - rare
diff --git a/runit/sv.c b/runit/sv.c
index 3267c7e4c..0817ab472 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -175,8 +175,8 @@ Exit Codes
//config: svc controls the state of services monitored by the runsv supervisor.
//config: It is comaptible with daemontools command with the same name.
-//applet:IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
-//applet:IF_SVC(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_SV( APPLET_NOEXEC(sv, sv, BB_DIR_USR_BIN, BB_SUID_DROP, sv ))
+//applet:IF_SVC(APPLET_NOEXEC(svc, svc, BB_DIR_USR_BIN, BB_SUID_DROP, svc))
//kbuild:lib-$(CONFIG_SV) += sv.o
//kbuild:lib-$(CONFIG_SVC) += sv.o