summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-06 14:15:24 +0200
committerDenys Vlasenko2017-08-06 14:15:24 +0200
commita759b22c29fed7d6c77efe0c3e27772371d0889b (patch)
tree6509a7f14e35cbdf837f8e3f665fa091b3759921
parentfbecca1bed1b6daf10341304af2156baabc7af57 (diff)
downloadbusybox-a759b22c29fed7d6c77efe0c3e27772371d0889b.zip
busybox-a759b22c29fed7d6c77efe0c3e27772371d0889b.tar.gz
nameif: make it NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--NOFORK_NOEXEC.lst4
-rw-r--r--networking/nameif.c2
-rw-r--r--procps/mpstat.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index 45b178c..9b33afc 100644
--- a/NOFORK_NOEXEC.lst
+++ b/NOFORK_NOEXEC.lst
@@ -237,10 +237,10 @@ modprobe - noexec
more - interactive, longterm
mount - suid
mountpoint - noexec. leaks: option -n "print dev name": find_block_device -> readdir+xstrdup
-mpstat - noexec candidate (it's a measuring tool, putting less load by itself is good), complex
+mpstat - longterm: "mpstat 1" runs indefinitely
mt - rare
mv - noexec candidate, runner
-nameif - leaks: config_open2+ioctl_or_perror_and_die
+nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die
nbd-client
nc - runner
netstat - runner with -c
diff --git a/networking/nameif.c b/networking/nameif.c
index 31ee98a..1f26954 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -40,7 +40,7 @@
//config: new_interface_name mac=00:80:C8:38:91:B5
//config: new_interface_name 00:80:C8:38:91:B5
-//applet:IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_NAMEIF(APPLET_NOEXEC(nameif, nameif, BB_DIR_SBIN, BB_SUID_DROP, nameif))
//kbuild:lib-$(CONFIG_NAMEIF) += nameif.o
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 1eabd8e..acaff4d 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -8,6 +8,7 @@
*/
//applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
+/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
//kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o