diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 21:23:03 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 21:23:03 +0200 |
commit | b9be78070569e69960ba2b3c4098c3dc3316b9bd (patch) | |
tree | a74d7de183adcf7ef4b4584ff42c3443343271af /coreutils | |
parent | 184c738582eb190489dd2e9d120b1e036df65401 (diff) | |
download | busybox-w32-b9be78070569e69960ba2b3c4098c3dc3316b9bd.tar.gz busybox-w32-b9be78070569e69960ba2b3c4098c3dc3316b9bd.tar.bz2 busybox-w32-b9be78070569e69960ba2b3c4098c3dc3316b9bd.zip |
sv,svc: fix NOEXEC fallout
function old new delta
svc_main 145 162 +17
sv 1280 1297 +17
status 139 133 -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 34/-6) Total: 28 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/cksum.c | 1 | ||||
-rw-r--r-- | coreutils/date.c | 1 | ||||
-rw-r--r-- | coreutils/stty.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/coreutils/cksum.c b/coreutils/cksum.c index c0cf65d2a..059a33310 100644 --- a/coreutils/cksum.c +++ b/coreutils/cksum.c | |||
@@ -13,6 +13,7 @@ | |||
13 | //config: cksum is used to calculate the CRC32 checksum of a file. | 13 | //config: cksum is used to calculate the CRC32 checksum of a file. |
14 | 14 | ||
15 | //applet:IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum)) | 15 | //applet:IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum)) |
16 | /* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */ | ||
16 | 17 | ||
17 | //kbuild:lib-$(CONFIG_CKSUM) += cksum.o | 18 | //kbuild:lib-$(CONFIG_CKSUM) += cksum.o |
18 | 19 | ||
diff --git a/coreutils/date.c b/coreutils/date.c index 89b281646..5a4ad5fe5 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -59,6 +59,7 @@ | |||
59 | //config: MMDDhhmm[[YY]YY][.ss] format. | 59 | //config: MMDDhhmm[[YY]YY][.ss] format. |
60 | 60 | ||
61 | //applet:IF_DATE(APPLET_NOEXEC(date, date, BB_DIR_BIN, BB_SUID_DROP, date)) | 61 | //applet:IF_DATE(APPLET_NOEXEC(date, date, BB_DIR_BIN, BB_SUID_DROP, date)) |
62 | /* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */ | ||
62 | 63 | ||
63 | //kbuild:lib-$(CONFIG_DATE) += date.o | 64 | //kbuild:lib-$(CONFIG_DATE) += date.o |
64 | 65 | ||
diff --git a/coreutils/stty.c b/coreutils/stty.c index 2292fa5ee..57e2cc30d 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c | |||
@@ -785,6 +785,7 @@ struct globals { | |||
785 | } FIX_ALIASING; | 785 | } FIX_ALIASING; |
786 | #define G (*(struct globals*)bb_common_bufsiz1) | 786 | #define G (*(struct globals*)bb_common_bufsiz1) |
787 | #define INIT_G() do { \ | 787 | #define INIT_G() do { \ |
788 | setup_common_bufsiz(); \ | ||
788 | G.device_name = bb_msg_standard_input; \ | 789 | G.device_name = bb_msg_standard_input; \ |
789 | G.max_col = 80; \ | 790 | G.max_col = 80; \ |
790 | G.current_col = 0; /* we are noexec, must clear */ \ | 791 | G.current_col = 0; /* we are noexec, must clear */ \ |