emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blkdiscard: make it NOEXEC

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-06 20:20:47 +02:00
parent bf18239e3d
commit 277081e0a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOFORK_NOEXEC.lst
View File

@ -49,7 +49,7 @@ awk - noexec. runner
base64 - runner base64 - runner
basename - NOFORK basename - NOFORK
beep beep
blkdiscard blkdiscard - noexec. leaks: open+xioctl
blkid - noexec blkid - noexec
blockdev - noexec. leaks fd blockdev - noexec. leaks fd
bootchartd - daemon bootchartd - daemon

4
util-linux/blkdiscard.c
View File

@ -11,8 +11,9 @@
//config: help //config: help
//config: blkdiscard discards sectors on a given device. //config: blkdiscard discards sectors on a given device.
//applet:IF_BLKDISCARD(APPLET_NOEXEC(blkdiscard, blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP, blkdiscard))
//kbuild:lib-$(CONFIG_BLKDISCARD) += blkdiscard.o //kbuild:lib-$(CONFIG_BLKDISCARD) += blkdiscard.o
//applet:IF_BLKDISCARD(APPLET(blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP))
//usage:#define blkdiscard_trivial_usage //usage:#define blkdiscard_trivial_usage
//usage: "[-o OFS] [-l LEN] [-s] DEVICE" //usage: "[-o OFS] [-l LEN] [-s] DEVICE"
@ -44,7 +45,6 @@ int blkdiscard_main(int argc UNUSED_PARAM, char **argv)
uint64_t offset; /* Leaving these two variables out does not */ uint64_t offset; /* Leaving these two variables out does not */
uint64_t length; /* shrink code size and hampers readability. */ uint64_t length; /* shrink code size and hampers readability. */
uint64_t range[2]; uint64_t range[2];
// struct stat st;
int fd; int fd;
enum { enum {