External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-09 23:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsh: Close stderr among with stdin in cmdComplete

Browse Source 
Our completer callbacks must refrain from printing anything onto
stderr, but unfortunately that's not how service code around
behaves. It may call vshError() and what not. Rather trying to
fix all possible paths (just consider opening a connection), just
close the stderr. We're already closing stdin.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2024-05-23 15:49:05 +02:00
parent 6aa94ce105
commit e4afe64825
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/vsh.c
View File

@ -3488,17 +3488,20 @@ const vshCmdInfo info_complete = {
#ifdef WITH_READLINE #ifdef WITH_READLINE
static virOnceControl vshCmdCompleteCloseStdinOnce = VIR_ONCE_CONTROL_INITIALIZER; static virOnceControl vshCmdCompleteCloseStdinStderrOnce = VIR_ONCE_CONTROL_INITIALIZER;
static void static void
vshCmdCompleteCloseStdin(void) vshCmdCompleteCloseStdinStderr(void)
{ {
/* In non-interactive mode which is how the 'complete' command is intended /* In non-interactive mode which is how the 'complete' command is intended
* to be used we need to ensure that any authentication callback will not * to be used we need to ensure that any authentication callback will not
* attempt to read any input which would break the completion */ * attempt to read any input which would break the completion. Similarly,
* printing anything onto stderr should be avoided. */
int stdin_fileno = STDIN_FILENO; int stdin_fileno = STDIN_FILENO;
int stderr_fileno = STDERR_FILENO;
VIR_FORCE_CLOSE(stdin_fileno); VIR_FORCE_CLOSE(stdin_fileno);
VIR_FORCE_CLOSE(stderr_fileno);
} }
@ -3519,7 +3522,7 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd)
* need to prevent auth hooks reading any input. Therefore, we * need to prevent auth hooks reading any input. Therefore, we
* have to close stdin and then connect ourselves. */ * have to close stdin and then connect ourselves. */
if (!ctl->imode) { if (!ctl->imode) {
if (virOnce(&vshCmdCompleteCloseStdinOnce, vshCmdCompleteCloseStdin) < 0) if (virOnce(&vshCmdCompleteCloseStdinStderrOnce, vshCmdCompleteCloseStdinStderr) < 0)
return false; return false;
} }