diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2016-01-24 01:20:45 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2016-01-24 01:20:45 +0000 |
| commit | d491f9d4cc61f44209579ac6dc99acfa55a8f51c (patch) | |
| tree | bbb4f71dea72bb318473a03c870d27bc8ede767e /sbin/mount_vnd/mount_vnd.c | |
| parent | 47394f4a5ff41ba21fc7f431b25a88ea643ceeb7 (diff) | |
Immediately zero the stack-allocated buffers for the passphrase and salt rather
than doing so conditionally later on. These were false positives during an
explicit_bzero audit.
ok gsoares@
Diffstat (limited to 'sbin/mount_vnd/mount_vnd.c')
| -rw-r--r-- | sbin/mount_vnd/mount_vnd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sbin/mount_vnd/mount_vnd.c b/sbin/mount_vnd/mount_vnd.c index 57f1d38cc4f..0ed04008830 100644 --- a/sbin/mount_vnd/mount_vnd.c +++ b/sbin/mount_vnd/mount_vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_vnd.c,v 1.18 2016/01/24 01:02:24 gsoares Exp $ */ +/* $OpenBSD: mount_vnd.c,v 1.19 2016/01/24 01:20:44 mmcc Exp $ */ /* * Copyright (c) 1993 University of Utah. * Copyright (c) 1990, 1993 @@ -182,8 +182,8 @@ main(int argc, char **argv) char * get_pkcs_key(char *arg, char *saltopt) { - char passphrase[128]; - char saltbuf[128], saltfilebuf[PATH_MAX]; + char passphrase[128] = {'\0'}; + char saltbuf[128] = {'\0'}, saltfilebuf[PATH_MAX]; char *key = NULL; char *saltfile; const char *errstr; @@ -192,7 +192,6 @@ get_pkcs_key(char *arg, char *saltopt) rounds = strtonum(arg, 1000, INT_MAX, &errstr); if (errstr) err(1, "rounds: %s", errstr); - bzero(passphrase, sizeof(passphrase)); if (readpassphrase("Encryption key: ", passphrase, sizeof(passphrase), RPP_REQUIRE_TTY) == NULL) errx(1, "Unable to read passphrase"); @@ -205,10 +204,9 @@ get_pkcs_key(char *arg, char *saltopt) if (saltfile) saltfile[strcspn(saltfile, "\n")] = '\0'; } - if (!saltfile || saltfile[0] == '\0') { + if (!saltfile || saltfile[0] == '\0') warnx("Skipping salt file, insecure"); - memset(saltbuf, 0, sizeof(saltbuf)); - } else { + else { int fd; fd = open(saltfile, O_RDONLY); |