aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 09:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

hsmtool: use flag TCSANOW when disabling tty ECHO, fixes rare hang in test_hsm*

Browse Source 
No idea why TCSAFLUSH was used, could not find anything in PR comments.
Also cannot explain exactly what causes the problem, but the hang can be reproduced
*with* TCSAFLUSH and not with TCSANOW.

According to termios doc:
TCSANOW
    the change occurs immediately.
TCSAFLUSH
    the change occurs after all output written to the object referred by fd has been
    transmitted, and all input that has been received but not read will be discarded
    before the change is made.
This commit is contained in:
Simon Vrouwe
2021-11-23 13:01:56 +02:00
committed by Rusty Russell
parent ae4623c21a
commit 4dded23cd3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/hsm_encryption.c
View File

@@ -103,7 +103,7 @@ char *read_stdin_pass(char **reason)
} }
temp_term = current_term; temp_term = current_term;
temp_term.c_lflag &= ~ECHO; temp_term.c_lflag &= ~ECHO;
if (tcsetattr(fileno(stdin), TCSAFLUSH, &temp_term) != 0) { if (tcsetattr(fileno(stdin), TCSANOW, &temp_term) != 0) {
*reason = "Could not disable pass echoing."; *reason = "Could not disable pass echoing.";
return NULL; return NULL;
} }
@@ -114,7 +114,7 @@ char *read_stdin_pass(char **reason)
} }
/* Restore the original terminal */ /* Restore the original terminal */
if (tcsetattr(fileno(stdin), TCSAFLUSH, &current_term) != 0) { if (tcsetattr(fileno(stdin), TCSANOW, &current_term) != 0) {
*reason = "Could not restore terminal options."; *reason = "Could not restore terminal options.";
free(passwd); free(passwd);
return NULL; return NULL;