From 99125c04950a7ba2ac90dc21c3d924fe9dd95651 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 5 Aug 2017 20:38:04 +0200
Subject: chattr,lsattr,tune2fs: make them NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 e2fsprogs/chattr.c  | 2 +-
 e2fsprogs/lsattr.c  | 3 ++-
 e2fsprogs/tune2fs.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'e2fsprogs')

diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index bb870a990..76a5253b6 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -15,7 +15,7 @@
 //config:	help
 //config:	chattr changes the file attributes on a second extended file system.
 
-//applet:IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CHATTR(APPLET_NOEXEC(chattr, chattr, BB_DIR_BIN, BB_SUID_DROP, chattr))
 
 //kbuild:lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
 
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 756d26832..56c1187c1 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -16,7 +16,8 @@
 //config:	help
 //config:	lsattr lists the file attributes on a second extended file system.
 
-//applet:IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_LSATTR(APPLET_NOEXEC(lsattr, lsattr, BB_DIR_BIN, BB_SUID_DROP, lsattr))
+/* ls is NOEXEC, so we should be too! ;) */
 
 //kbuild:lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 95411db5f..9f14b26ec 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -13,7 +13,7 @@
 //config:	tune2fs allows the system administrator to adjust various tunable
 //config:	filesystem parameters on Linux ext2/ext3 filesystems.
 
-//applet:IF_TUNE2FS(APPLET(tune2fs, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_TUNE2FS(APPLET_NOEXEC(tune2fs, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, tune2fs))
 
 //TODO alias to "tune2fs -L LABEL": //applet:IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
 
-- 
cgit v1.2.3