emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make 17 state-changing execing applets (ex: "nice PROG ARGS") noexec

Browse Source 
The applets with "<applet> [opts] PROG ARGS" API very quickly exec
another program, noexec is okay for them:

 chpst/envdir/envuidgid/softlimit/setuidgid
 chroot
 chrt
 ionice
 nice
 nohup
 setarch/linux32/linux64
 taskset
 cttyhack

"reset" and "sulogin" applets don't have this form, but also exec
another program at once, thus made noexec too.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-04 19:55:01 +02:00
parent 6514785f95
commit 5c527dc57e
12 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
NOFORK_NOEXEC.lst
View File

@ -20,7 +20,7 @@ suid: runs under different uid - must fork+exec
Why shouldn't be NOFORK/NOEXEC: Why shouldn't be NOFORK/NOEXEC:
rare: not started often enough to bother optimizing (example: poweroff) rare: not started often enough to bother optimizing (example: poweroff)
daemon: runs indefinitely; these are also always fit "rare" category daemon: runs indefinitely; these are also always fit "rare" category
longterm: often runs for a long time (many seconds), execing would make longterm: often runs for a long time (many seconds), execing makes
memory footprint smaller memory footprint smaller
complex: no immediately obvious reason why NOFORK wouldn't work, complex: no immediately obvious reason why NOFORK wouldn't work,
but does some non-obvoius operations (example: fuser, lsof, losetup); but does some non-obvoius operations (example: fuser, lsof, losetup);
@ -66,9 +66,9 @@ chgrp - noexec. runner
chmod - noexec. runner chmod - noexec. runner
chown - noexec. runner chown - noexec. runner
chpasswd - runner (list of "user:password"s from stdin) chpasswd - runner (list of "user:password"s from stdin)
chpst - noexec candidate, spawner chpst - noexec. spawner
chroot - noexec candidate, spawner chroot - noexec. spawner
chrt - noexec candidate, spawner chrt - noexec. spawner
chvt - leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds. Also, "rare" category. noexec candidate. chvt - leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds. Also, "rare" category. noexec candidate.
cksum - noexec. runner cksum - noexec. runner
clear - NOFORK clear - NOFORK
@ -80,7 +80,7 @@ cpio - runner
crond - daemon crond - daemon
crontab 0 leaks: open+xasprintf crontab 0 leaks: open+xasprintf
cryptpw - changes state: with --password-fd=N, moves N to stdin. Also, "rare" category. noexec candidate. cryptpw - changes state: with --password-fd=N, moves N to stdin. Also, "rare" category. noexec candidate.
cttyhack - noexec candidate, spawner cttyhack - noexec. spawner
cut - noexec. runner cut - noexec. runner
date - noexec. nofork candidate(needs to stop messing up env, free xasprintf result, not use xfuncs after xasprintf) date - noexec. nofork candidate(needs to stop messing up env, free xasprintf result, not use xfuncs after xasprintf)
dc - runner (eats stdin if no params) dc - runner (eats stdin if no params)
@ -107,8 +107,8 @@ ed - interactive, longterm
egrep - longterm runner ("CMD | egrep ..." may run indefinitely, better to exec to conserve memory) egrep - longterm runner ("CMD | egrep ..." may run indefinitely, better to exec to conserve memory)
eject - leaks: open+ioctl_or_perror_and_die, changes state (moves fds) eject - leaks: open+ioctl_or_perror_and_die, changes state (moves fds)
env - noexec. spawner, changes state (env) env - noexec. spawner, changes state (env)
envdir - noexec candidate, spawner envdir - noexec. spawner
envuidgid - noexec candidate, spawner envuidgid - noexec. spawner
expand - runner expand - runner
expr - leaks: nested allocs expr - leaks: nested allocs
factor - runner (eats stdin if no params) factor - runner (eats stdin if no params)
@ -128,7 +128,7 @@ flash_eraseall
flash_lock flash_lock
flash_unlock flash_unlock
flashcp flashcp
flock - spawner, changes state (file locks) flock - spawner, changes state (file locks), let's play safe and not be noexec
fold - noexec. runner fold - noexec. runner
free - nofork candidate(struct globals, needs to close /proc/meminfo fd) free - nofork candidate(struct globals, needs to close /proc/meminfo fd)
freeramdisk - leaks: open+ioctl_or_perror_and_die freeramdisk - leaks: open+ioctl_or_perror_and_die
@ -170,7 +170,7 @@ init - daemon
inotifyd - daemon inotifyd - daemon
insmod - noexec insmod - noexec
install - runner install - runner
ionice - spawner ionice - noexec. spawner
iostat - runner iostat - runner
ip - noexec candidate ip - noexec candidate
ipaddr - noexec candidate ipaddr - noexec candidate
@ -190,8 +190,8 @@ klogd - daemon
last - runner (I've got 1300 lines of output when tried it) last - runner (I've got 1300 lines of output when tried it)
less - interactive, longterm less - interactive, longterm
link - NOFORK link - NOFORK
linux32 - spawner linux32 - noexec. spawner
linux64 - spawner linux64 - noexec. spawner
linuxrc - daemon linuxrc - daemon
ln - noexec ln - noexec
loadfont - leaks: config_open+bb_error_msg_and_die("map format") loadfont - leaks: config_open+bb_error_msg_and_die("map format")
@ -247,11 +247,11 @@ netstat - runner with -c
nice - noexec candidate, spawner nice - noexec candidate, spawner
nl - runner nl - runner
nmeter - longterm nmeter - longterm
nohup - noexec candidate (maybe free concat_path_file result?), spawner nohup - noexec. spawner
nproc - NOFORK nproc - NOFORK
ntpd - daemon ntpd - daemon
od - runner od - runner
openvt - spawner openvt - longterm: spawns a child and waits for it
partprobe - noexec candidate (simple), leaks: open+ioctl_or_perror_and_die(BLKRRPART) partprobe - noexec candidate (simple), leaks: open+ioctl_or_perror_and_die(BLKRRPART)
passwd - suid passwd - suid
paste - noexec. runner paste - noexec. runner
@ -304,15 +304,15 @@ scriptreplay
sed - runner sed - runner
sendmail - runner sendmail - runner
seq - noexec. runner seq - noexec. runner
setarch - spawner setarch - noexec. spawner
setconsole setconsole
setfont setfont
setkeycodes setkeycodes
setlogcons setlogcons
setpriv - spawner setpriv - spawner, changes state, let's play safe and not be noexec
setserial setserial
setsid - spawner setsid - spawner, uses fork_or_rexec() [not audted to work in noexec], let's play safe and not be noexec
setuidgid setuidgid - noexec. spawner
sha1sum - noexec. runner sha1sum - noexec. runner
sha256sum - noexec. runner sha256sum - noexec. runner
sha3sum - noexec. runner sha3sum - noexec. runner
@ -323,7 +323,7 @@ shuf - noexec. runner
slattach slattach
sleep - runner, longterm sleep - runner, longterm
smemcap - runner smemcap - runner
softlimit - noexec candidate, spawner softlimit - noexec. spawner
sort - noexec. runner sort - noexec. runner
split - runner split - runner
ssl_client - longterm ssl_client - longterm
@ -332,21 +332,21 @@ stat - nofork candidate(needs fewer allocs)
strings - runner strings - runner
stty - noexec/nofork candidate. has no allocs or opens except xmove_fd(xopen("-F DEVICE"),STDIN). tcsetattr(STDIN) is not a problem: it would work the same across processes sharing this fd stty - noexec/nofork candidate. has no allocs or opens except xmove_fd(xopen("-F DEVICE"),STDIN). tcsetattr(STDIN) is not a problem: it would work the same across processes sharing this fd
su - suid, spawner su - suid, spawner
sulogin - spawner sulogin - noexec. spawner
sum - runner sum - runner
sv - noexec candidate, needs ^C (uses usleep(420000)) sv - noexec candidate, needs ^C (uses usleep(420000))
svc - noexec candidate, needs ^C (uses usleep(420000)) svc - noexec candidate, needs ^C (uses usleep(420000))
svlogd - daemon svlogd - daemon
swapoff - rare swapoff - rare
swapon - rare swapon - rare
switch_root - spawner, rare, changes state switch_root - spawner, rare, changes state (oh yes), execing may be important to free binary's inode
sync - NOFORK sync - NOFORK
sysctl - noexec candidate, leaks: xstrdup+xmalloc_read sysctl - noexec candidate, leaks: xstrdup+xmalloc_read
syslogd - daemon syslogd - daemon
tac - noexec. runner tac - noexec. runner
tail - runner tail - runner
tar - runner tar - runner
taskset - spawner taskset - noexec. spawner
tcpsvd - daemon tcpsvd - daemon
tee - runner tee - runner
telnet - interactive, longterm telnet - interactive, longterm
@ -354,8 +354,8 @@ telnetd - daemon
test - NOFORK test - NOFORK
tftp - runner tftp - runner
tftpd - daemon tftpd - daemon
time - spawner, changes state (signals) time - spawner, longterm, changes state (signals)
timeout - spawner, changes state (signals) timeout - spawner, longterm, changes state (signals)
top - interactive, longterm top - interactive, longterm
touch - NOFORK touch - NOFORK
tr - runner tr - runner

2
console-tools/reset.c
View File

@ -16,7 +16,7 @@
//config: This program is used to reset the terminal screen, if it //config: This program is used to reset the terminal screen, if it
//config: gets messed up. //config: gets messed up.
//applet:IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_RESET(APPLET_NOEXEC(reset, reset, BB_DIR_USR_BIN, BB_SUID_DROP, reset))
//kbuild:lib-$(CONFIG_RESET) += reset.o //kbuild:lib-$(CONFIG_RESET) += reset.o

3
coreutils/chroot.c
View File

@ -13,7 +13,7 @@
//config: chroot is used to change the root directory and run a command. //config: chroot is used to change the root directory and run a command.
//config: The default command is '/bin/sh'. //config: The default command is '/bin/sh'.
//applet:IF_CHROOT(APPLET(chroot, BB_DIR_USR_SBIN, BB_SUID_DROP)) //applet:IF_CHROOT(APPLET_NOEXEC(chroot, chroot, BB_DIR_USR_SBIN, BB_SUID_DROP, chroot))
//kbuild:lib-$(CONFIG_CHROOT) += chroot.o //kbuild:lib-$(CONFIG_CHROOT) += chroot.o
@ -40,6 +40,7 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
++argv; ++argv;
if (!*argv) if (!*argv)
bb_show_usage(); bb_show_usage();
xchroot(*argv); xchroot(*argv);
++argv; ++argv;

2
coreutils/nice.c
View File

@ -12,7 +12,7 @@
//config: help //config: help
//config: nice runs a program with modified scheduling priority. //config: nice runs a program with modified scheduling priority.
//applet:IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_NICE(APPLET_NOEXEC(nice, nice, BB_DIR_BIN, BB_SUID_DROP, nice))
//kbuild:lib-$(CONFIG_NICE) += nice.o //kbuild:lib-$(CONFIG_NICE) += nice.o

2
coreutils/nohup.c
View File

@ -15,7 +15,7 @@
//config: help //config: help
//config: run a command immune to hangups, with output to a non-tty. //config: run a command immune to hangups, with output to a non-tty.
//applet:IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_NOHUP(APPLET_NOEXEC(nohup, nohup, BB_DIR_USR_BIN, BB_SUID_DROP, nohup))
//kbuild:lib-$(CONFIG_NOHUP) += nohup.o //kbuild:lib-$(CONFIG_NOHUP) += nohup.o

4
loginutils/sulogin.c
View File

@ -12,7 +12,7 @@
//config: sulogin is invoked when the system goes into single user //config: sulogin is invoked when the system goes into single user
//config: mode (this is done through an entry in inittab). //config: mode (this is done through an entry in inittab).
//applet:IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP)) //applet:IF_SULOGIN(APPLET_NOEXEC(sulogin, sulogin, BB_DIR_SBIN, BB_SUID_DROP, sulogin))
//kbuild:lib-$(CONFIG_SULOGIN) += sulogin.o //kbuild:lib-$(CONFIG_SULOGIN) += sulogin.o
@ -34,7 +34,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
/* Note: sulogin is not a suid app. It is meant to be run by init /* Note: sulogin is not a suid app. It is meant to be run by init
* for single user / emergency mode. init starts it as root. * for single user / emergency mode. init starts it as root.
* Normal users (potentially malisious ones) can only run it under * Normal users (potentially malicious ones) can only run it under
* their UID, therefore no paranoia here is warranted: * their UID, therefore no paranoia here is warranted:
* $LD_LIBRARY_PATH in env, TTY = /dev/sda * $LD_LIBRARY_PATH in env, TTY = /dev/sda
* are no more dangerous here than in e.g. cp applet. * are no more dangerous here than in e.g. cp applet.

12
runit/chpst.c
View File

@ -59,12 +59,12 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//config: help //config: help
//config: Sets soft resource limits as specified by options //config: Sets soft resource limits as specified by options
//applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_CHPST( APPLET_NOEXEC(chpst, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, chpst))
// APPLET_ODDNAME:name main location suid_type help // APPLET_NOEXEC:name main location suid_type help
//applet:IF_ENVDIR( APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) //applet:IF_ENVDIR( APPLET_NOEXEC(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
//applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid)) //applet:IF_ENVUIDGID(APPLET_NOEXEC(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
//applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid)) //applet:IF_SETUIDGID(APPLET_NOEXEC(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
//applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit)) //applet:IF_SOFTLIMIT(APPLET_NOEXEC(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
//kbuild:lib-$(CONFIG_CHPST) += chpst.o //kbuild:lib-$(CONFIG_CHPST) += chpst.o
//kbuild:lib-$(CONFIG_ENVDIR) += chpst.o //kbuild:lib-$(CONFIG_ENVDIR) += chpst.o

2
shell/cttyhack.c
View File

@ -6,7 +6,7 @@
*/ */
#include "libbb.h" #include "libbb.h"
//applet:IF_CTTYHACK(APPLET(cttyhack, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o //kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o

2
util-linux/chrt.c
View File

@ -12,7 +12,7 @@
//config: manipulate real-time attributes of a process. //config: manipulate real-time attributes of a process.
//config: This requires sched_{g,s}etparam support in your libc. //config: This requires sched_{g,s}etparam support in your libc.
//applet:IF_CHRT(APPLET(chrt, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_CHRT(APPLET_NOEXEC(chrt, chrt, BB_DIR_USR_BIN, BB_SUID_DROP, chrt))
//kbuild:lib-$(CONFIG_CHRT) += chrt.o //kbuild:lib-$(CONFIG_CHRT) += chrt.o

2
util-linux/ionice.c
View File

@ -14,7 +14,7 @@
//config: Set/set program io scheduling class and priority //config: Set/set program io scheduling class and priority
//config: Requires kernel >= 2.6.13 //config: Requires kernel >= 2.6.13
//applet:IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_IONICE(APPLET_NOEXEC(ionice, ionice, BB_DIR_BIN, BB_SUID_DROP, ionice))
//kbuild:lib-$(CONFIG_IONICE) += ionice.o //kbuild:lib-$(CONFIG_IONICE) += ionice.o

8
util-linux/setarch.c
View File

@ -30,10 +30,10 @@
//config: help //config: help
//config: Alias to "setarch linux64". //config: Alias to "setarch linux64".
//applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_SETARCH(APPLET_NOEXEC(setarch, setarch, BB_DIR_BIN, BB_SUID_DROP, setarch))
// APPLET_ODDNAME:name main location suid_type help // APPLET_NOEXEC:name main location suid_type help
//applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) //applet:IF_LINUX32(APPLET_NOEXEC(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
//applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) //applet:IF_LINUX64(APPLET_NOEXEC(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
//kbuild:lib-$(CONFIG_SETARCH) += setarch.o //kbuild:lib-$(CONFIG_SETARCH) += setarch.o
//kbuild:lib-$(CONFIG_LINUX32) += setarch.o //kbuild:lib-$(CONFIG_LINUX32) += setarch.o

2
util-linux/taskset.c
View File

@ -22,7 +22,7 @@
//config: affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long //config: affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
//config: in this case. Otherwise, it is limited to sizeof(long). //config: in this case. Otherwise, it is limited to sizeof(long).
//applet:IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_TASKSET(APPLET_NOEXEC(taskset, taskset, BB_DIR_USR_BIN, BB_SUID_DROP, taskset))
//kbuild:lib-$(CONFIG_TASKSET) += taskset.o //kbuild:lib-$(CONFIG_TASKSET) += taskset.o
//usage:#define taskset_trivial_usage //usage:#define taskset_trivial_usage