[git commit] sv, svc: make them NOEXEC

Denys Vlasenko vda.linux at googlemail.com
Fri Aug 4 23:42:08 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=a453ca576fba45849784322681a4515bdab9ceab
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 NOFORK_NOEXEC.lst | 4 ++--
 runit/sv.c        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index b2f4101..f6cc548 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 3267c7e..0817ab4 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


More information about the busybox-cvs mailing list