diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-10 14:15:52 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-10 14:15:52 +0200 |
| commit | 9a6f62fd5172c14adf765285d6c000691d89d58d (patch) | |
| tree | c6e2c64b2eedc21caf076ebc4096cb6025e37c52 | |
| parent | 1fd8e66203906f6e245959de1bc293556e6ab7fa (diff) | |
| download | busybox-w32-9a6f62fd5172c14adf765285d6c000691d89d58d.tar.gz busybox-w32-9a6f62fd5172c14adf765285d6c000691d89d58d.tar.bz2 busybox-w32-9a6f62fd5172c14adf765285d6c000691d89d58d.zip | |
ps: make it NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | NOFORK_NOEXEC.lst | 4 | ||||
| -rw-r--r-- | procps/ps.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst index fd5b35838..3070a321b 100644 --- a/NOFORK_NOEXEC.lst +++ b/NOFORK_NOEXEC.lst | |||
| @@ -283,8 +283,8 @@ poweroff - rare | |||
| 283 | powertop - interactive, longterm | 283 | powertop - interactive, longterm |
| 284 | printenv - NOFORK | 284 | printenv - NOFORK |
| 285 | printf - NOFORK | 285 | printf - NOFORK |
| 286 | ps - looks for AT_CLKTCK elf aux vector, therefore can't be noexec | 286 | ps - noexec |
| 287 | pscan - longterm | 287 | pscan - talks to network |
| 288 | pstree - noexec | 288 | pstree - noexec |
| 289 | pwd - NOFORK | 289 | pwd - NOFORK |
| 290 | pwdx - NOFORK | 290 | pwdx - NOFORK |
diff --git a/procps/ps.c b/procps/ps.c index fab8c81eb..2a53cc974 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -50,8 +50,7 @@ | |||
| 50 | //config: Include support for measuring HZ on old kernels and non-ELF systems | 50 | //config: Include support for measuring HZ on old kernels and non-ELF systems |
| 51 | //config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) | 51 | //config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) |
| 52 | 52 | ||
| 53 | //applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP)) | 53 | //applet:IF_PS(APPLET_NOEXEC(ps, ps, BB_DIR_BIN, BB_SUID_DROP, ps)) |
| 54 | /* can't be NOEXEC: uses ELF aux vector. To have it, we must be a normal, execed process */ | ||
| 55 | 54 | ||
| 56 | //kbuild:lib-$(CONFIG_PS) += ps.o | 55 | //kbuild:lib-$(CONFIG_PS) += ps.o |
| 57 | 56 | ||