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

expr: make it NOEXEC

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-07 23:23:18 +02:00
parent ec98e3a628
commit af5d008669
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NOFORK_NOEXEC.lst
View File

@ -108,12 +108,12 @@ dumpleases - leaks: open+xread
echo - NOFORK echo - NOFORK
ed - interactive, longterm 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 - hardware, 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. spawner envdir - noexec. spawner
envuidgid - noexec. spawner envuidgid - noexec. spawner
expand - runner expand - runner
expr - leaks: nested allocs expr - noexec. leaks: nested allocs
factor - runner (eats stdin if no params) factor - runner (eats stdin if no params)
fakeidentd - daemon fakeidentd - daemon
false - NOFORK false - NOFORK

7
coreutils/expr.c
View File

@ -38,7 +38,7 @@
//config: the applet slightly larger, but will allow computation with very //config: the applet slightly larger, but will allow computation with very
//config: large numbers. //config: large numbers.
//applet:IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_EXPR(APPLET_NOEXEC(expr, expr, BB_DIR_USR_BIN, BB_SUID_DROP, expr))
//kbuild:lib-$(CONFIG_EXPR) += expr.o //kbuild:lib-$(CONFIG_EXPR) += expr.o
@ -118,7 +118,10 @@ struct globals {
char **args; char **args;
} FIX_ALIASING; } FIX_ALIASING;
#define G (*(struct globals*)bb_common_bufsiz1) #define G (*(struct globals*)bb_common_bufsiz1)
#define INIT_G() do { setup_common_bufsiz(); } while (0) #define INIT_G() do { \
setup_common_bufsiz(); \
/* NB: noexec applet - globals not zeroed */ \
} while (0)
/* forward declarations */ /* forward declarations */
static VALUE *eval(void); static VALUE *eval(void);