summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-06 20:16:28 +0200
committerDenys Vlasenko2017-08-06 20:16:28 +0200
commitbf18239e3d6305fc83e5177bd9a27c5114cc4c16 (patch)
tree5b39259fe80cbfecb81bbfb6ed782620b7c0e656
parent86e07f6893cfe94a4a7c4aba4b643752808d4235 (diff)
downloadbusybox-bf18239e3d6305fc83e5177bd9a27c5114cc4c16.zip
busybox-bf18239e3d6305fc83e5177bd9a27c5114cc4c16.tar.gz
blkid: make it NOEXEC, make FEATURE_BLKID_TYPE=y default
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--NOFORK_NOEXEC.lst2
-rw-r--r--util-linux/blkid.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index dc28280..9735e75 100644
--- a/NOFORK_NOEXEC.lst
+++ b/NOFORK_NOEXEC.lst
@@ -50,7 +50,7 @@ base64 - runner
basename - NOFORK
beep
blkdiscard
-blkid
+blkid - noexec
blockdev - noexec. leaks fd
bootchartd - daemon
brctl - noexec
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 0bd701a..a56b696 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -16,12 +16,12 @@
//config:
//config:config FEATURE_BLKID_TYPE
//config: bool "Print filesystem type"
-//config: default n
+//config: default y
//config: depends on BLKID
//config: help
//config: Show TYPE="filesystem type"
-//applet:IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_BLKID(APPLET_NOEXEC(blkid, blkid, BB_DIR_SBIN, BB_SUID_DROP, blkid))
//kbuild:lib-$(CONFIG_BLKID) += blkid.o