[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/23] qemu-char: check socket is actually connec
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 14/23] qemu-char: check socket is actually connected |
Date: |
Fri, 24 Jun 2016 15:51:01 +0200 |
From: Marc-André Lureau <address@hidden>
Calling qemu_chr_fe_set_msgfds() on unconnected socket can lead to crash
if s->ioc is NULL.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 84f49ac..06eaba3 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2761,14 +2761,16 @@ static int tcp_set_msgfds(CharDriverState *chr, int
*fds, int num)
{
TCPCharDriver *s = chr->opaque;
- if (!qio_channel_has_feature(s->ioc,
- QIO_CHANNEL_FEATURE_FD_PASS)) {
- return -1;
- }
/* clear old pending fd array */
g_free(s->write_msgfds);
s->write_msgfds = NULL;
+ if (!s->connected ||
+ !qio_channel_has_feature(s->ioc,
+ QIO_CHANNEL_FEATURE_FD_PASS)) {
+ return -1;
+ }
+
if (num) {
s->write_msgfds = g_new(int, num);
memcpy(s->write_msgfds, fds, num * sizeof(int));
--
2.9.0
- [Qemu-devel] [PATCH v2 04/23] vhost: make vhost_log_put() idempotent, (continued)
- [Qemu-devel] [PATCH v2 04/23] vhost: make vhost_log_put() idempotent, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 05/23] vhost: call vhost_log_put() on cleanup, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 06/23] vhost: add vhost device only after all success, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 07/23] vhost: make vhost_dev_cleanup() idempotent, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 15/23] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 09/23] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init(), marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 10/23] vhost: change some assert() for error_report() or silent fail, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 11/23] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 12/23] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 16/23] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 14/23] qemu-char: check socket is actually connected,
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 18/23] vhost-net: success if backend has no ops->vhost_migration_done, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 17/23] get_vhost_net() should be != null after vhost_user_init, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 22/23] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 20/23] char: add chr_wait_connected callback, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 19/23] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 13/23] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/06/24
- [Qemu-devel] [PATCH v2 21/23] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/06/24