[git commit] blkid: make it NOEXEC, make FEATURE_BLKID_TYPE=y default

Denys Vlasenko vda.linux at googlemail.com
Sun Aug 6 18:16:28 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=bf18239e3d6305fc83e5177bd9a27c5114cc4c16
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 NOFORK_NOEXEC.lst  | 2 +-
 util-linux/blkid.c | 4 ++--
 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
 


More information about the busybox-cvs mailing list