From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails
Date: Wed, 20 May 2015 10:34:11 +0200 [thread overview]
Message-ID: <1432110853-11399-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1432110853-11399-1-git-send-email-kraxel@redhat.com>
From: Cole Robinson <crobinso@redhat.com>
Reproducer:
$ qemu-system-x86_64 -display vnc=unix:/root/i-cant-access-you.sock
qemu-system-x86_64: iohandler.c:60: qemu_set_fd_handler2: Assertion `fd >= 0' failed.
Aborted (core dumped)
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 076355d..fe4cd75 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3684,6 +3684,9 @@ void vnc_display_open(const char *id, Error **errp)
/* listen for connects */
if (strncmp(vnc, "unix:", 5) == 0) {
vs->lsock = unix_listen(vnc+5, NULL, 0, errp);
+ if (vs->lsock < 0) {
+ goto fail;
+ }
vs->is_unix = true;
} else {
vs->lsock = inet_listen_opts(sopts, 5900, errp);
--
1.8.3.1
next prev parent reply other threads:[~2015-05-20 8:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 8:34 [Qemu-devel] [PULL 0/5] vnc patch queue Gerd Hoffmann
2015-05-20 8:34 ` [Qemu-devel] [PULL 1/5] Strip brackets from vnc host Gerd Hoffmann
2015-05-20 8:34 ` [Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init() Gerd Hoffmann
2015-05-20 8:34 ` Gerd Hoffmann [this message]
2015-05-20 8:34 ` [Qemu-devel] [PULL 4/5] vnc: Tweak error when init fails Gerd Hoffmann
2015-05-20 8:34 ` [Qemu-devel] [PULL 5/5] qemu-sockets: Report explicit error if unlink fails Gerd Hoffmann
2015-05-21 9:24 ` [Qemu-devel] [PULL 0/5] vnc patch queue Peter Maydell
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=1432110853-11399-4-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=crobinso@redhat.com \
--cc=qemu-devel@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).