diff options
author | Yury Kotov <yury-kotov@yandex-team.ru> | 2019-05-23 12:44:33 +0300 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-06-17 20:36:56 +0200 |
commit | 854f63d44065567c2991b5050f7d4011ca985c4e (patch) | |
tree | 2d98fc1c268d82e4e9fbf2882cec3ee589aa8fdd | |
parent | 076243ffe6c1b687e9e6d98348c3bf3398df78f3 (diff) | |
download | qemu-854f63d44065567c2991b5050f7d4011ca985c4e.zip qemu-854f63d44065567c2991b5050f7d4011ca985c4e.tar.gz qemu-854f63d44065567c2991b5050f7d4011ca985c4e.tar.bz2 |
monitor: Fix return type of monitor_fdset_dup_fd_find
monitor_fdset_dup_fd_find_remove() and monitor_fdset_dup_fd_find()
return mon_fdset->id which is int64_t. Downcasting from int64_t to int
leads to a bug with removing fd from fdset with id >= 2^32.
So, fix return types for these function.
Signed-off-by: Yury Kotov <yury-kotov@yandex-team.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523094433.30297-1-yury-kotov@yandex-team.ru>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r-- | include/monitor/monitor.h | 2 | ||||
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | stubs/fdset.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 06cfcd8..1e1d6d2 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -44,6 +44,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); void monitor_fdset_dup_fd_remove(int dup_fd); -int monitor_fdset_dup_fd_find(int dup_fd); +int64_t monitor_fdset_dup_fd_find(int dup_fd); #endif /* MONITOR_H */ @@ -2604,7 +2604,7 @@ err: return -1; } -static int monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove) +static int64_t monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove) { MonFdset *mon_fdset; MonFdsetFd *mon_fdset_fd_dup; @@ -2632,7 +2632,7 @@ err: return -1; } -int monitor_fdset_dup_fd_find(int dup_fd) +int64_t monitor_fdset_dup_fd_find(int dup_fd) { return monitor_fdset_dup_fd_find_remove(dup_fd, false); } diff --git a/stubs/fdset.c b/stubs/fdset.c index f3d9980..67dd5e1 100644 --- a/stubs/fdset.c +++ b/stubs/fdset.c @@ -6,7 +6,7 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) return -1; } -int monitor_fdset_dup_fd_find(int dup_fd) +int64_t monitor_fdset_dup_fd_find(int dup_fd) { return -1; } |