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 /console-tools/resize.c | |
| 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 'console-tools/resize.c')
| -rw-r--r-- | console-tools/resize.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/console-tools/resize.c b/console-tools/resize.c index 97866673a..8aa487c41 100644 --- a/console-tools/resize.c +++ b/console-tools/resize.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | //config: COLUMNS=80;LINES=44;export COLUMNS LINES; | 24 | //config: COLUMNS=80;LINES=44;export COLUMNS LINES; |
| 25 | 25 | ||
| 26 | //applet:IF_RESIZE(APPLET_NOEXEC(resize, resize, BB_DIR_USR_BIN, BB_SUID_DROP, resize)) | 26 | //applet:IF_RESIZE(APPLET_NOEXEC(resize, resize, BB_DIR_USR_BIN, BB_SUID_DROP, resize)) |
| 27 | /* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */ | ||
| 27 | 28 | ||
| 28 | //kbuild:lib-$(CONFIG_RESIZE) += resize.o | 29 | //kbuild:lib-$(CONFIG_RESIZE) += resize.o |
| 29 | 30 | ||
| @@ -63,6 +64,7 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
| 63 | */ | 64 | */ |
| 64 | 65 | ||
| 65 | tcgetattr(STDERR_FILENO, old_termios_p); /* fiddle echo */ | 66 | tcgetattr(STDERR_FILENO, old_termios_p); /* fiddle echo */ |
| 67 | //TODO: die if the above fails? | ||
| 66 | memcpy(&new, old_termios_p, sizeof(new)); | 68 | memcpy(&new, old_termios_p, sizeof(new)); |
| 67 | new.c_cflag |= (CLOCAL | CREAD); | 69 | new.c_cflag |= (CLOCAL | CREAD); |
| 68 | new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); | 70 | new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); |