diff options
| author | Sami Kerola | 2017-01-05 23:33:40 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-01-16 12:30:09 +0100 |
| commit | 875834381ddbe8c08fdada759f08d6d6ad83b749 (patch) | |
| tree | 7c3acd06f98fc15b241ff8186a4e83adc09f75d9 /login-utils/newgrp.c | |
| parent | tests: Introduce libmount/loop (diff) | |
| download | kernel-qcow2-util-linux-875834381ddbe8c08fdada759f08d6d6ad83b749.tar.gz kernel-qcow2-util-linux-875834381ddbe8c08fdada759f08d6d6ad83b749.tar.xz kernel-qcow2-util-linux-875834381ddbe8c08fdada759f08d6d6ad83b749.zip | |
newgrp: use libc explicit_bzero() when it is available
This currently new function will be part of glibc 2.25.
Reference: https://sourceware.org/git/?p=glibc.git;a=commit;h=ea1bd74defcf9d5291d14972e63105168ca9eb4f
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'login-utils/newgrp.c')
| -rw-r--r-- | login-utils/newgrp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c index 367333ec3..63a45cd6a 100644 --- a/login-utils/newgrp.c +++ b/login-utils/newgrp.c @@ -60,6 +60,7 @@ static char *xgetpass(FILE *input, const char *prompt) return pass; } +#ifndef HAVE_EXPLICIT_BZERO /* Ensure memory is set to value c without compiler optimization getting * into way that could happen with memset(3). */ static int xmemset_s(void *v, size_t sz, const int c) @@ -72,6 +73,7 @@ static int xmemset_s(void *v, size_t sz, const int c) *p++ = c; return 0; } +#endif /* try to read password from gshadow */ static char *get_gshadow_pwd(const char *groupname) @@ -148,7 +150,11 @@ static int allow_setgid(const struct passwd *pe, const struct group *ge) if (pwd && *pwd && (xpwd = xgetpass(stdin, _("Password: ")))) { char *cbuf = crypt(xpwd, pwd); +#ifdef HAVE_EXPLICIT_BZERO + explicit_bzero(xpwd, strlen(xpwd)); +#else xmemset_s(xpwd, strlen(xpwd), 0); +#endif free(xpwd); if (!cbuf) warn(_("crypt failed")); |