picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ask-password: erase character read with _cleanup_ 

This is much nicer, since it means we erase the character regardless how
we exit the scope.
This commit is contained in:
Lennart Poettering 2019-03-20 10:29:20 +01:00
parent d5d1ae153f
commit e1ed99c8c8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/memory-util.h
View File

@ -77,3 +77,8 @@ static inline void* explicit_bzero_safe(void *p, size_t l) {
#else
void *explicit_bzero_safe(void *p, size_t l);
#endif
/* Use with _cleanup_ to erase a single 'char' when leaving scope */
static inline void erase_char(char *p) {
explicit_bzero_safe(p, sizeof(char));
}

5
src/shared/ask-password-api.c
View File

@ -306,9 +306,9 @@ int ask_password_tty(
};
for (;;) {
_cleanup_(erase_char) char c;
int sleep_for = -1, k;
ssize_t n;
char c;
if (until > 0) {
usec_t y;
@ -452,9 +452,6 @@ int ask_password_tty(
dirty = true;
}
/* Let's forget this char, just to not keep needlessly copies of key material around */
c = 'x';
}
x = strndup(passphrase, p);