RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix multiple issues in legacy function getpass 

1. failure to output a newline after the password is read
2. fd leaks via missing FD_CLOEXEC
3. fd leaks via failure-to-close when any of the standard streams are
   closed at the time of the call
4. wrongful fallback to use of stdin when opening /dev/tty fails
5. wrongful use of stderr rather than /dev/tty for prompt
6. failure to report error reading password
This commit is contained in:
Rich Felker 2014-07-06 01:34:13 -04:00
parent 83dc6eb087
commit ea496d6c63
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/legacy/getpass.c
View File

@ -3,6 +3,7 @@
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h>
char *getpass(const char *prompt) char *getpass(const char *prompt)
{ {
@ -11,7 +12,7 @@ char *getpass(const char *prompt)
ssize_t l; ssize_t l;
static char password[128]; static char password[128];
if ((fd = open("/dev/tty", O_RDONLY|O_NOCTTY)) < 0) fd = 0; if ((fd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC)) < 0) return 0;
tcgetattr(fd, &t); tcgetattr(fd, &t);
s = t; s = t;
@ -22,8 +23,7 @@ char *getpass(const char *prompt)
tcsetattr(fd, TCSAFLUSH, &t); tcsetattr(fd, TCSAFLUSH, &t);
tcdrain(fd); tcdrain(fd);
fputs(prompt, stderr); dprintf(fd, "%s", prompt);
fflush(stderr);
l = read(fd, password, sizeof password); l = read(fd, password, sizeof password);
if (l >= 0) { if (l >= 0) {
@ -33,7 +33,8 @@ char *getpass(const char *prompt)
tcsetattr(fd, TCSAFLUSH, &s); tcsetattr(fd, TCSAFLUSH, &s);
if (fd > 2) close(fd); dprintf(fd, "\n");
close(fd);
return password; return l<0 ? 0 : password;
} }