From bf18239e3d6305fc83e5177bd9a27c5114cc4c16 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Aug 2017 20:16:28 +0200 Subject: [PATCH] blkid: make it NOEXEC, make FEATURE_BLKID_TYPE=y default Signed-off-by: Denys Vlasenko --- 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 dc2828069..9735e756a 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 0bd701aae..a56b69661 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