From 4bb08af34e8961e912855d00b946654500799385 Mon Sep 17 00:00:00 2001 From: Hani Benhabiles Date: Tue, 29 Jul 2014 23:22:40 +0100 Subject: monitor: Remove hardcoded watchdog event names Signed-off-by: Hani Benhabiles Signed-off-by: Luiz Capitulino --- monitor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index cdbaa60f98..48f0fdc7e9 100644 --- a/monitor.c +++ b/monitor.c @@ -4521,16 +4521,15 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str) void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) { + int i; + if (nb_args != 2) { return; } readline_set_completion_index(rs, strlen(str)); - add_completion_option(rs, str, "reset"); - add_completion_option(rs, str, "shutdown"); - add_completion_option(rs, str, "poweroff"); - add_completion_option(rs, str, "pause"); - add_completion_option(rs, str, "debug"); - add_completion_option(rs, str, "none"); + for (i = 0; WatchdogExpirationAction_lookup[i]; i++) { + add_completion_option(rs, str, WatchdogExpirationAction_lookup[i]); + } } void migrate_set_capability_completion(ReadLineState *rs, int nb_args, -- cgit v1.2.1 From 2928207ac1bb2751a1554ea0f9a9641179f51488 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Sun, 3 Aug 2014 23:28:56 +0800 Subject: dump.c: Fix memory leak issue in cleanup processing for dump_init() In dump_init(), when failure occurs, need notice about 'fd' and memory mapping. So call dump_cleanup() for it (need let all initializations at front). Also simplify dump_cleanup(): remove redundant 'ret' and redundant 'fd' checking. Signed-off-by: Chen Gang Reviewed-by: Laszlo Ersek Signed-off-by: Luiz Capitulino --- dump.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dump.c b/dump.c index ce646bcc51..71d3e946e6 100644 --- a/dump.c +++ b/dump.c @@ -71,18 +71,14 @@ uint64_t cpu_to_dump64(DumpState *s, uint64_t val) static int dump_cleanup(DumpState *s) { - int ret = 0; - guest_phys_blocks_free(&s->guest_phys_blocks); memory_mapping_list_free(&s->list); - if (s->fd != -1) { - close(s->fd); - } + close(s->fd); if (s->resume) { vm_start(); } - return ret; + return 0; } static void dump_error(DumpState *s, const char *reason) @@ -1499,6 +1495,8 @@ static int dump_init(DumpState *s, int fd, bool has_format, s->begin = begin; s->length = length; + memory_mapping_list_init(&s->list); + guest_phys_blocks_init(&s->guest_phys_blocks); guest_phys_blocks_append(&s->guest_phys_blocks); @@ -1526,7 +1524,6 @@ static int dump_init(DumpState *s, int fd, bool has_format, } /* get memory mapping */ - memory_mapping_list_init(&s->list); if (paging) { qemu_get_guest_memory_mapping(&s->list, &s->guest_phys_blocks, &err); if (err != NULL) { @@ -1622,12 +1619,7 @@ static int dump_init(DumpState *s, int fd, bool has_format, return 0; cleanup: - guest_phys_blocks_free(&s->guest_phys_blocks); - - if (s->resume) { - vm_start(); - } - + dump_cleanup(s); return -1; } -- cgit v1.2.1 From b3dd1b8c295636e64ceb14cdc4db6420d7319e38 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 17 Aug 2014 11:45:17 +0200 Subject: monitor: fix use after free The function monitor_fdset_dup_fd_find_remove() references member of 'mon_fdset' which - when remove flag is set - may be freed in function monitor_fdset_cleanup(). remove is set by monitor_fdset_dup_fd_remove which in practice does not need the returned value, so make it void, and return -1 from monitor_fdset_dup_fd_find_remove. Reported-by: zhanghailiang Signed-off-by: Michael S. Tsirkin Signed-off-by: Luiz Capitulino --- include/monitor/monitor.h | 2 +- monitor.c | 8 +++++--- stubs/fdset-remove-fd.c | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 3d6929d6cd..78a5fc8197 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -64,7 +64,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, Error **errp); int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); -int monitor_fdset_dup_fd_remove(int dup_fd); +void monitor_fdset_dup_fd_remove(int dup_fd); int monitor_fdset_dup_fd_find(int dup_fd); #endif /* !MONITOR_H */ diff --git a/monitor.c b/monitor.c index 48f0fdc7e9..34cee74eb3 100644 --- a/monitor.c +++ b/monitor.c @@ -2542,8 +2542,10 @@ static int monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove) if (QLIST_EMPTY(&mon_fdset->dup_fds)) { monitor_fdset_cleanup(mon_fdset); } + return -1; + } else { + return mon_fdset->id; } - return mon_fdset->id; } } } @@ -2555,9 +2557,9 @@ int monitor_fdset_dup_fd_find(int dup_fd) return monitor_fdset_dup_fd_find_remove(dup_fd, false); } -int monitor_fdset_dup_fd_remove(int dup_fd) +void monitor_fdset_dup_fd_remove(int dup_fd) { - return monitor_fdset_dup_fd_find_remove(dup_fd, true); + monitor_fdset_dup_fd_find_remove(dup_fd, true); } int monitor_handle_fd_param(Monitor *mon, const char *fdname) diff --git a/stubs/fdset-remove-fd.c b/stubs/fdset-remove-fd.c index b3886d9f45..7f6d61e619 100644 --- a/stubs/fdset-remove-fd.c +++ b/stubs/fdset-remove-fd.c @@ -1,7 +1,6 @@ #include "qemu-common.h" #include "monitor/monitor.h" -int monitor_fdset_dup_fd_remove(int dupfd) +void monitor_fdset_dup_fd_remove(int dupfd) { - return -1; } -- cgit v1.2.1