From: Laurent Vivier <laurent@vivier.eu>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: "qemu-trivial@nongnu.org" <qemu-trivial@nongnu.org>,
pbonzini@redhat.com, kraxel@redhat.com, qemu-stable@nongnu.org,
dgilbert@redhat.com
Subject: Re: [PATCH 1/2] hmp: Unbreak "change vnc"
Date: Thu, 23 Sep 2021 17:03:46 +0200 [thread overview]
Message-ID: <2a2a7d19-d5c5-5ca3-184d-baf450b840ff@vivier.eu> (raw)
In-Reply-To: <20210909081219.308065-2-armbru@redhat.com>
Le 09/09/2021 à 10:12, Markus Armbruster a écrit :
> HMP command "change vnc" can take the password as argument, or prompt
> for it:
>
> (qemu) change vnc password 123
> (qemu) change vnc password
> Password: ***
> (qemu)
>
> This regressed in commit cfb5387a1d "hmp: remove "change vnc TARGET"
> command", v6.0.0.
>
> (qemu) change vnc passwd 123
> Password: ***
> (qemu) change vnc passwd
> (qemu)
>
> The latter passes NULL to qmp_change_vnc_password(), which is a no-no.
> Looks like it puts the display into "password required, but none set"
> state.
>
> The logic error is easy to miss in review, but testing should've
> caught it.
>
> Fix the obvious way.
>
> Fixes: cfb5387a1de2acda23fb5c97d2378b9e7ddf8025
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> monitor/hmp-cmds.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index e00255f7ee..a7e197a90b 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -1496,7 +1496,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
> }
> if (strcmp(target, "passwd") == 0 ||
> strcmp(target, "password") == 0) {
> - if (arg) {
> + if (!arg) {
> MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
> monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
> return;
>
Applied to my trivial-patches branch.
Thanks,
Laurent
next prev parent reply other threads:[~2021-09-23 15:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 8:12 [PATCH 0/2] hmp: Unbreak "change vnc", tidy up set_password's doc Markus Armbruster
2021-09-09 8:12 ` [PATCH 1/2] hmp: Unbreak "change vnc" Markus Armbruster
2021-09-09 8:42 ` Daniel P. Berrangé
2021-09-23 15:03 ` Laurent Vivier [this message]
2021-09-09 8:12 ` [PATCH 2/2] hmp: Drop a bogus sentence from set_password's documentation Markus Armbruster
2021-09-09 8:42 ` Daniel P. Berrangé
2021-09-23 15:04 ` Laurent Vivier
2021-09-10 5:29 ` [PATCH 0/2] hmp: Unbreak "change vnc", tidy up set_password's doc Gerd Hoffmann
2021-09-17 12:13 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a2a7d19-d5c5-5ca3-184d-baf450b840ff@vivier.eu \
--to=laurent@vivier.eu \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).