fdb92359e
Denys Vlasenko
2017-08-05
Subject
pivot_root: make it NOFORK
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
NOFORK_NOEXEC.lst+1 -1
| @@ -261,7 +261,7 @@ pidof - nofork candidate(uses find_pid_by_name, is that ok?) | |
| ping - suid, runner | |
| ping6 - suid, runner | |
| pipe_progress - longterm | |
| - | pivot_root - nofork candidate? the code is trivial |
| + | pivot_root - NOFORK |
| pkill - nofork candidate(xregcomp, procps_scan - are they ok?) | |
| pmap - noexec candidate, leaks: open+xstrdup | |
| popmaildir - runner | |
util-linux/pivot_root.c+4 -2
| @@ -21,7 +21,7 @@ | |
| //config: Note: This is for initrd in linux 2.4. Under initramfs (introduced | |
| //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 | |
| @@ -33,7 +33,7 @@ | |
| #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) | |
| @@ -41,6 +41,8 @@ int pivot_root_main(int argc, char **argv) | |
| if (argc != 3) | |
| bb_show_usage(); | |
| + | /* NOFORK applet. Hardly matters wrt performance, but code is trivial */ |
| + | |
| if (pivot_root(argv[1], argv[2]) < 0) { | |
| /* prints "pivot_root: <strerror text>" */ | |
| bb_perror_nomsg_and_die(); | |