diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-05 02:08:23 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-05 02:08:23 +0200 |
| commit | feb79e8742eb3cef211804dadcc7f3ddfd154c72 (patch) | |
| tree | a6a081240e03c7acffe5c1c4ff16e2f921a63298 | |
| parent | ff53bee72300ba97c645404a64c7091991ffa110 (diff) | |
| download | busybox-w32-feb79e8742eb3cef211804dadcc7f3ddfd154c72.tar.gz busybox-w32-feb79e8742eb3cef211804dadcc7f3ddfd154c72.tar.bz2 busybox-w32-feb79e8742eb3cef211804dadcc7f3ddfd154c72.zip | |
cryptpw, mkpasswd: make them NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | NOFORK_NOEXEC.lst | 4 | ||||
| -rw-r--r-- | loginutils/cryptpw.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst index 1d23ad962..1bb571b9c 100644 --- a/NOFORK_NOEXEC.lst +++ b/NOFORK_NOEXEC.lst | |||
| @@ -79,7 +79,7 @@ cp - noexec. runner | |||
| 79 | cpio - runner | 79 | cpio - runner |
| 80 | crond - daemon | 80 | crond - daemon |
| 81 | crontab 0 leaks: open+xasprintf | 81 | crontab 0 leaks: open+xasprintf |
| 82 | cryptpw - changes state: with --password-fd=N, moves N to stdin. Also, "rare" category. noexec candidate. | 82 | cryptpw - noexec. changes state: with --password-fd=N, moves N to stdin |
| 83 | cttyhack - noexec. spawner | 83 | cttyhack - noexec. spawner |
| 84 | cut - noexec. runner | 84 | cut - noexec. runner |
| 85 | date - noexec. nofork candidate(needs to stop messing up env, free xasprintf result, not use xfuncs after xasprintf) | 85 | date - noexec. nofork candidate(needs to stop messing up env, free xasprintf result, not use xfuncs after xasprintf) |
| @@ -229,7 +229,7 @@ mkfs.ext2 - needs ^C | |||
| 229 | mkfs.minix - needs ^C | 229 | mkfs.minix - needs ^C |
| 230 | mkfs.vfat - needs ^C | 230 | mkfs.vfat - needs ^C |
| 231 | mknod - noexec | 231 | mknod - noexec |
| 232 | mkpasswd - changes state: with --password-fd=N, moves N to stdin. Also, "rare" category. noexec candidate. | 232 | mkpasswd - noexec. changes state: with --password-fd=N, moves N to stdin |
| 233 | mkswap - needs ^C | 233 | mkswap - needs ^C |
| 234 | mktemp - noexec. leaks: xstrdup+concat_path_file | 234 | mktemp - noexec. leaks: xstrdup+concat_path_file |
| 235 | modinfo - noexec | 235 | modinfo - noexec |
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index f8906c59a..136c619bb 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c | |||
| @@ -24,9 +24,9 @@ | |||
| 24 | //config: using the given salt. Debian has this utility under mkpasswd | 24 | //config: using the given salt. Debian has this utility under mkpasswd |
| 25 | //config: name. Busybox provides mkpasswd as an alias for cryptpw. | 25 | //config: name. Busybox provides mkpasswd as an alias for cryptpw. |
| 26 | 26 | ||
| 27 | //applet:IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP)) | 27 | //applet:IF_CRYPTPW( APPLET_NOEXEC(cryptpw, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw)) |
| 28 | // APPLET_ODDNAME:name main location suid_type help | 28 | // APPLET_NOEXEC:name main location suid_type help |
| 29 | //applet:IF_MKPASSWD(APPLET_ODDNAME(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw)) | 29 | //applet:IF_MKPASSWD(APPLET_NOEXEC(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw)) |
| 30 | 30 | ||
| 31 | //kbuild:lib-$(CONFIG_CRYPTPW) += cryptpw.o | 31 | //kbuild:lib-$(CONFIG_CRYPTPW) += cryptpw.o |
| 32 | //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o | 32 | //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o |