|
 |
a2b174 |
diff -up ./src/tgetpass.c.CVE-2019-18634 ./src/tgetpass.c
|
|
|
a2b174 |
--- ./src/tgetpass.c.CVE-2019-18634 2019-10-28 13:27:39.000000000 +0100
|
|
|
a2b174 |
+++ ./src/tgetpass.c 2020-02-05 14:08:27.516101197 +0100
|
|
|
a2b174 |
@@ -61,7 +61,7 @@ enum tgetpass_errval {
|
|
|
a2b174 |
static volatile sig_atomic_t signo[NSIG];
|
|
|
a2b174 |
|
|
|
a2b174 |
static void tgetpass_handler(int);
|
|
|
a2b174 |
-static char *getln(int, char *, size_t, int, enum tgetpass_errval *);
|
|
|
a2b174 |
+static char *getln(int, char *, size_t, bool, enum tgetpass_errval *);
|
|
|
a2b174 |
static char *sudo_askpass(const char *, const char *);
|
|
|
a2b174 |
|
|
|
a2b174 |
static int
|
|
|
a2b174 |
@@ -125,6 +125,7 @@ tgetpass(const char *prompt, int timeout
|
|
|
a2b174 |
static char buf[SUDO_CONV_REPL_MAX + 1];
|
|
|
a2b174 |
int i, input, output, save_errno, ttyfd;
|
|
|
a2b174 |
bool need_restart, neednl = false;
|
|
|
a2b174 |
+ bool feedback = ISSET(flags, TGP_MASK);
|
|
|
a2b174 |
enum tgetpass_errval errval;
|
|
|
a2b174 |
debug_decl(tgetpass, SUDO_DEBUG_CONV)
|
|
|
a2b174 |
|
|
|
a2b174 |
@@ -180,7 +181,7 @@ restart:
|
|
|
a2b174 |
*/
|
|
|
a2b174 |
if (!ISSET(flags, TGP_ECHO)) {
|
|
|
a2b174 |
for (;;) {
|
|
|
a2b174 |
- if (ISSET(flags, TGP_MASK))
|
|
|
a2b174 |
+ if (feedback)
|
|
|
a2b174 |
neednl = sudo_term_cbreak(input);
|
|
|
a2b174 |
else
|
|
|
a2b174 |
neednl = sudo_term_noecho(input);
|
|
|
a2b174 |
@@ -194,6 +195,9 @@ restart:
|
|
|
a2b174 |
}
|
|
|
a2b174 |
}
|
|
|
a2b174 |
}
|
|
|
a2b174 |
+ /* Only use feedback mode when we can disable echo. */
|
|
|
a2b174 |
+ if (!neednl)
|
|
|
a2b174 |
+ feedback = false;
|
|
|
a2b174 |
|
|
|
a2b174 |
/*
|
|
|
a2b174 |
* Catch signals that would otherwise cause the user to end
|
|
|
a2b174 |
@@ -224,7 +228,7 @@ restart:
|
|
|
a2b174 |
|
|
|
a2b174 |
if (timeout > 0)
|
|
|
a2b174 |
alarm(timeout);
|
|
|
a2b174 |
- pass = getln(input, buf, sizeof(buf), ISSET(flags, TGP_MASK), &errval);
|
|
|
a2b174 |
+ pass = getln(input, buf, sizeof(buf), feedback, &errval);
|
|
|
a2b174 |
alarm(0);
|
|
|
a2b174 |
save_errno = errno;
|
|
|
a2b174 |
|
|
|
a2b174 |
@@ -360,7 +364,7 @@ sudo_askpass(const char *askpass, const
|
|
|
a2b174 |
extern int sudo_term_eof, sudo_term_erase, sudo_term_kill;
|
|
|
a2b174 |
|
|
|
a2b174 |
static char *
|
|
|
a2b174 |
-getln(int fd, char *buf, size_t bufsiz, int feedback,
|
|
|
a2b174 |
+getln(int fd, char *buf, size_t bufsiz, bool feedback,
|
|
|
a2b174 |
enum tgetpass_errval *errval)
|
|
|
a2b174 |
{
|
|
|
a2b174 |
size_t left = bufsiz;
|
|
|
a2b174 |
@@ -389,15 +393,15 @@ getln(int fd, char *buf, size_t bufsiz,
|
|
|
a2b174 |
while (cp > buf) {
|
|
|
a2b174 |
if (write(fd, "\b \b", 3) == -1)
|
|
|
a2b174 |
break;
|
|
|
a2b174 |
- --cp;
|
|
|
a2b174 |
+ cp--;
|
|
|
a2b174 |
}
|
|
|
a2b174 |
+ cp = buf;
|
|
|
a2b174 |
left = bufsiz;
|
|
|
a2b174 |
continue;
|
|
|
a2b174 |
} else if (c == sudo_term_erase) {
|
|
|
a2b174 |
if (cp > buf) {
|
|
|
a2b174 |
- if (write(fd, "\b \b", 3) == -1)
|
|
|
a2b174 |
- break;
|
|
|
a2b174 |
- --cp;
|
|
|
a2b174 |
+ ignore_result(write(fd, "\b \b", 3));
|
|
|
a2b174 |
+ cp--;
|
|
|
a2b174 |
left++;
|
|
|
a2b174 |
}
|
|
|
a2b174 |
continue;
|