blkid: make it NOEXEC, make FEATURE_BLKID_TYPE=y default

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index dc2828069adb5f57969d59fa30db22f3bf225553..9735e756adbeadeed45e54f579a72f9ed851e4d9 100644 (file)
--- 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 0bd701aae395a40701a8f4d8a8b11e21c27c0e93..a56b69661b5e7e3a736e9a2436ad30ff10475aca 100644 (file)
--- 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