From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyXgc-00085h-JT for qemu-devel@nongnu.org; Sat, 21 Jun 2014 22:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WyXgX-0001Al-LI for qemu-devel@nongnu.org; Sat, 21 Jun 2014 22:39:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyXgX-0001Af-Bp for qemu-devel@nongnu.org; Sat, 21 Jun 2014 22:39:13 -0400 From: Stefan Hajnoczi Date: Sun, 22 Jun 2014 10:38:37 +0800 Message-Id: <1403404717-12101-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1403404717-12101-1-git-send-email-stefanha@redhat.com> References: <1403404717-12101-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-2.1 2/2] qemu-char: avoid leaking unused fds in tcp_get_msgfds() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Nikolay Nikolaev , Stefan Hajnoczi , Anthony Liguori , "Michael S. Tsirkin" Commit c76bf6bb8fbbb233a7d3641e09229d23747d5ee3 ("Add chardev API qemu_chr_fe_get_msgfds") extended the get_msgfds API from one to multiple file descriptors. It forgot to close unused file descriptors before freeing the file descriptor array. This patch prevents a file descriptor leak if the tcp_get_msgfds() callers requests fewer file descriptors than are available. Cc: Nikolay Nikolaev Signed-off-by: Stefan Hajnoczi --- qemu-char.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 6ee2275..a52613d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2482,8 +2482,15 @@ static int tcp_get_msgfds(CharDriverState *chr, int *fds, int num) int to_copy = (s->read_msgfds_num < num) ? s->read_msgfds_num : num; if (to_copy) { + int i; + memcpy(fds, s->read_msgfds, to_copy * sizeof(int)); + /* Close unused fds */ + for (i = to_copy; i < s->read_msgfds_num; i++) { + close(s->read_msgfds[i]); + } + g_free(s->read_msgfds); s->read_msgfds = 0; s->read_msgfds_num = 0; -- 1.9.3