All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cole Robinson <crobinso@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PATCH v3 1/3] vnc: Don't assert if opening unix socket fails
Date: Tue,  5 May 2015 11:07:17 -0400	[thread overview]
Message-ID: <f1b79963ec1c938a1d95fe5758d3165b9992148c.1430838327.git.crobinso@redhat.com> (raw)
In-Reply-To: <cover.1430838327.git.crobinso@redhat.com>
In-Reply-To: <cover.1430838327.git.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>
---
v3:
    Fix checkpatch warning

 ui/vnc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/vnc.c b/ui/vnc.c
index 9f8ecd0..e1abf64 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3685,6 +3685,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);
-- 
2.4.0

  reply	other threads:[~2015-05-05 15:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-05 15:07 [Qemu-devel] [PATCH v3 0/3] vnc: Fixes for unix socket error handling Cole Robinson
2015-05-05 15:07 ` Cole Robinson [this message]
2015-05-05 15:07 ` [Qemu-devel] [PATCH v3 2/3] vnc: Tweak error when init fails Cole Robinson
2015-05-05 15:07 ` [Qemu-devel] [PATCH v3 3/3] qemu-sockets: Report explicit error if unlink fails Cole Robinson
2015-05-05 15:20 ` [Qemu-devel] [PATCH v3 0/3] vnc: Fixes for unix socket error handling Eric Blake
2015-05-06  7:23 ` Gerd Hoffmann

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=f1b79963ec1c938a1d95fe5758d3165b9992148c.1430838327.git.crobinso@redhat.com \
    --to=crobinso@redhat.com \
    --cc=kraxel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.