From patchwork Thu Jul 19 18:53:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 172035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ABF4A2C01CC for ; Fri, 20 Jul 2012 05:00:16 +1000 (EST) Received: from localhost ([::1]:42980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrvxJ-0006HY-NU for incoming@patchwork.ozlabs.org; Thu, 19 Jul 2012 15:00:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvwz-0005ja-V4 for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Srvwy-0001Jc-DP for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:59:49 -0400 Received: from vms173003pub.verizon.net ([206.46.173.3]:30225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvwy-0001JO-9H for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:59:48 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M7F009ZL8QKFBYA@vms173003.mailsrvcs.net> for qemu-devel@nongnu.org; Thu, 19 Jul 2012 13:59:10 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 2D8E91F958; Thu, 19 Jul 2012 13:53:37 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id C2F23815D7; Thu, 19 Jul 2012 13:53:36 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2012 13:53:23 -0500 Message-id: <1342724013-1633-9-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1342724013-1633-1-git-send-email-minyard@acm.org> References: <1342724013-1633-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.3 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 08/18] qemu-char: Close fd at end of file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Corey Minyard The chardev backends that used qemu_chr_open_fd did not get their file descriptors closed at end of file or when the chardev was closed. This could result in a file descriptor leak. Signed-off-by: Corey Minyard --- qemu-char.c | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 6c3e61e..dac319c 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -566,6 +566,7 @@ static int stdio_nb_clients; typedef struct { int fd_in, fd_out; int max_size; + int close_fds_on_close; } FDCharDriver; @@ -584,6 +585,20 @@ static int fd_chr_read_poll(void *opaque) return s->max_size; } +static void fd_close_fds(FDCharDriver *s) +{ + if (!s->close_fds_on_close) { + return; + } + + if ((s->fd_out != s->fd_in) && (s->fd_out != -1)) { + close(s->fd_out); + } + s->fd_out = -1; + close(s->fd_in); + s->fd_in = -1; +} + static void fd_chr_read(void *opaque) { CharDriverState *chr = opaque; @@ -600,6 +615,7 @@ static void fd_chr_read(void *opaque) if (size == 0) { /* FD has been closed. Remove it from the active list. */ qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL); + fd_close_fds(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); return; } @@ -629,6 +645,7 @@ static void fd_chr_close(struct CharDriverState *chr) if (display_type == DT_NOGRAPHIC && s->fd_in == 0) { } else { qemu_set_fd_handler2(s->fd_in, NULL, NULL, NULL, NULL); + fd_close_fds(s); } } @@ -638,13 +655,15 @@ static void fd_chr_close(struct CharDriverState *chr) /* open a character device to a unix fd */ static CharDriverState *qemu_chr_open_fd(CharDriverState *chr, - int fd_in, int fd_out) + int fd_in, int fd_out, + int close_fds_on_close) { FDCharDriver *s; s = g_malloc0(sizeof(FDCharDriver)); s->fd_in = fd_in; s->fd_out = fd_out; + s->close_fds_on_close = close_fds_on_close; chr->opaque = s; chr->chr_write = fd_chr_write; chr->chr_update_read_handler = fd_chr_update_read_handler; @@ -665,7 +684,7 @@ static CharDriverState *qemu_chr_open_file_out(CharDriverState *chr, if (fd_out < 0) { return NULL; } - return qemu_chr_open_fd(chr, -1, fd_out); + return qemu_chr_open_fd(chr, -1, fd_out, 1); } static CharDriverState *qemu_chr_open_pipe(CharDriverState *chr, QemuOpts *opts) @@ -693,7 +712,7 @@ static CharDriverState *qemu_chr_open_pipe(CharDriverState *chr, QemuOpts *opts) return NULL; } } - return qemu_chr_open_fd(chr, fd_in, fd_out); + return qemu_chr_open_fd(chr, fd_in, fd_out, 1); } @@ -797,7 +816,7 @@ static CharDriverState *qemu_chr_open_stdio(CharDriverState *chr, atexit(term_exit); } - qemu_chr_open_fd(chr, 0, 1); + qemu_chr_open_fd(chr, 0, 1, 0); chr->chr_close = qemu_chr_close_stdio; chr->chr_set_echo = qemu_chr_set_echo_stdio; qemu_set_fd_handler2(0, stdio_read_poll, stdio_read, NULL, chr); @@ -1242,7 +1261,7 @@ static CharDriverState *qemu_chr_open_tty(CharDriverState *chr, QemuOpts *opts) return NULL; } tty_serial_init(fd, 115200, 'N', 8, 1); - qemu_chr_open_fd(chr, fd, fd); + qemu_chr_open_fd(chr, fd, fd, 1); chr->chr_ioctl = tty_serial_ioctl; chr->chr_close = qemu_chr_close_tty; return chr; @@ -2316,7 +2335,7 @@ static void tcp_chr_read(void *opaque) CharDriverState *qemu_chr_open_eventfd(int eventfd) { CharDriverState *chr = g_malloc0(sizeof(CharDriverState)); - return qemu_chr_open_fd(chr, eventfd, eventfd); + return qemu_chr_open_fd(chr, eventfd, eventfd, 0); } #endif