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

pivot_root: make it NOFORK

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-05 01:51:12 +02:00
parent 9c49d6e11b
commit fdb92359e4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOFORK_NOEXEC.lst
View File

@ -261,7 +261,7 @@ pidof - nofork candidate(uses find_pid_by_name, is that ok?)
ping - suid, runner ping - suid, runner
ping6 - suid, runner ping6 - suid, runner
pipe_progress - longterm pipe_progress - longterm
pivot_root - nofork candidate? the code is trivial pivot_root - NOFORK
pkill - nofork candidate(xregcomp, procps_scan - are they ok?) pkill - nofork candidate(xregcomp, procps_scan - are they ok?)
pmap - noexec candidate, leaks: open+xstrdup pmap - noexec candidate, leaks: open+xstrdup
popmaildir - runner popmaildir - runner

6
util-linux/pivot_root.c
View File

@ -21,7 +21,7 @@
//config: Note: This is for initrd in linux 2.4. Under initramfs (introduced //config: Note: This is for initrd in linux 2.4. Under initramfs (introduced
//config: in linux 2.6) use switch_root instead. //config: in linux 2.6) use switch_root instead.
//applet:IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP)) //applet:IF_PIVOT_ROOT(APPLET_NOFORK(pivot_root, pivot_root, BB_DIR_SBIN, BB_SUID_DROP, pivot_root))
//kbuild:lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o //kbuild:lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o
@ -33,7 +33,7 @@
#include "libbb.h" #include "libbb.h"
extern int pivot_root(const char * new_root,const char * put_old); extern int pivot_root(const char *new_root, const char *put_old);
int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int pivot_root_main(int argc, char **argv) int pivot_root_main(int argc, char **argv)
@ -41,6 +41,8 @@ int pivot_root_main(int argc, char **argv)
if (argc != 3) if (argc != 3)
bb_show_usage(); bb_show_usage();
/* NOFORK applet. Hardly matters wrt performance, but code is trivial */
if (pivot_root(argv[1], argv[2]) < 0) { if (pivot_root(argv[1], argv[2]) < 0) {
/* prints "pivot_root: <strerror text>" */ /* prints "pivot_root: <strerror text>" */
bb_perror_nomsg_and_die(); bb_perror_nomsg_and_die();