[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconne
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconnect |
Date: |
Wed, 15 Aug 2012 15:56:40 +0200 |
From: Corey Bryant <address@hidden>
Fd sets are shared by all monitor connections. Fd sets are considered
to be in use while at least one monitor is connected. When the last
monitor disconnects, all fds that are members of an fd set with no
outstanding dup references are closed. This prevents any fd leakage
associated with a client disconnect prior to using a passed fd.
Signed-off-by: Corey Bryant <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
monitor.c | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index a4a29b9..ce42466 100644
--- a/monitor.c
+++ b/monitor.c
@@ -200,6 +200,7 @@ struct Monitor {
static QLIST_HEAD(mon_list, Monitor) mon_list;
static QLIST_HEAD(mon_fdsets, MonFdset) mon_fdsets;
+static int mon_refcount;
static mon_cmd_t mon_cmds[];
static mon_cmd_t info_cmds[];
@@ -2391,7 +2392,8 @@ static void monitor_fdset_cleanup(MonFdset *mon_fdset)
MonFdsetFd *mon_fdset_fd_next;
QLIST_FOREACH_SAFE(mon_fdset_fd, &mon_fdset->fds, next, mon_fdset_fd_next)
{
- if (mon_fdset_fd->removed) {
+ if (mon_fdset_fd->removed ||
+ (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) {
close(mon_fdset_fd->fd);
g_free(mon_fdset_fd->opaque);
QLIST_REMOVE(mon_fdset_fd, next);
@@ -2405,6 +2407,16 @@ static void monitor_fdset_cleanup(MonFdset *mon_fdset)
}
}
+static void monitor_fdsets_cleanup(void)
+{
+ MonFdset *mon_fdset;
+ MonFdset *mon_fdset_next;
+
+ QLIST_FOREACH_SAFE(mon_fdset, &mon_fdsets, next, mon_fdset_next) {
+ monitor_fdset_cleanup(mon_fdset);
+ }
+}
+
AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque,
const char *opaque, Error **errp)
{
@@ -4824,9 +4836,12 @@ static void monitor_control_event(void *opaque, int
event)
data = get_qmp_greeting();
monitor_json_emitter(mon, data);
qobject_decref(data);
+ mon_refcount++;
break;
case CHR_EVENT_CLOSED:
json_message_parser_destroy(&mon->mc->parser);
+ mon_refcount--;
+ monitor_fdsets_cleanup();
break;
}
}
@@ -4867,6 +4882,12 @@ static void monitor_event(void *opaque, int event)
readline_show_prompt(mon->rs);
}
mon->reset_seen = 1;
+ mon_refcount++;
+ break;
+
+ case CHR_EVENT_CLOSED:
+ mon_refcount--;
+ monitor_fdsets_cleanup();
break;
}
}
--
1.7.6.5
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 02/10] qapi: Introduce add-fd, remove-fd, query-fdsets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 04/10] block: Convert open calls to qemu_open, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 05/10] block: Convert close calls to qemu_close, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 06/10] block: Enable qemu_open/close to work with fd sets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconnect,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/10] block: Flush parent to OS with cache=unsafe, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 10/10] qemu-iotests: Fix 030 after switch to GenericError, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 08/10] iscsi: Fix NULL dereferences / races between task completion and abort, Kevin Wolf, 2012/08/15
- Re: [Qemu-devel] [PULL 00/10] Block patches, Anthony Liguori, 2012/08/15