From patchwork Wed May 29 22:08:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 247404 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 A10BA2C007B for ; Thu, 30 May 2013 08:09:48 +1000 (EST) Received: from localhost ([::1]:44250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoZ0-0003Ap-PP for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 18:09:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYK-0002uq-IA for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhoYE-0004UM-D4 for qemu-devel@nongnu.org; Wed, 29 May 2013 18:09:04 -0400 Received: from vms173025pub.verizon.net ([206.46.173.25]:41905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhoYE-0004T0-7x for qemu-devel@nongnu.org; Wed, 29 May 2013 18:08:58 -0400 Received: from wf-rch.minyard.home ([unknown] [173.74.121.95]) by vms173025.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MNK00GSMYU41B20@vms173025.mailsrvcs.net> for qemu-devel@nongnu.org; Wed, 29 May 2013 17:08:35 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 7B3A51F8F6; Wed, 29 May 2013 17:08:25 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 668777FDA7; Wed, 29 May 2013 17:08:26 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 29 May 2013 17:08:01 -0500 Message-id: <1369865296-19584-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1369865296-19584-1-git-send-email-minyard@acm.org> References: <1369865296-19584-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.46.173.25 Cc: Corey Minyard , openipmi-developer@lists.sourceforge.net Subject: [Qemu-devel] [PATCH 05/20] 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 | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 1270a65..e959ccf 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -796,6 +796,8 @@ typedef struct FDCharDriver { guint fd_in_tag; int max_size; QTAILQ_ENTRY(FDCharDriver) node; + int close_fdin; + int close_fdout; } FDCharDriver; static int fd_chr_write(CharDriverState *chr, const uint8_t *buf, int len) @@ -805,6 +807,18 @@ static int fd_chr_write(CharDriverState *chr, const uint8_t *buf, int len) return io_channel_send(s->fd_out, buf, len); } +static void fd_close_fds(FDCharDriver *s) +{ + if ((s->close_fdin != s->close_fdout) && (s->close_fdout != -1)) { + close(s->close_fdout); + } + s->close_fdout = -1; + if (s->close_fdin != -1) { + close(s->close_fdin); + } + s->close_fdin = -1; +} + static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) { CharDriverState *chr = opaque; @@ -829,6 +843,7 @@ static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) io_remove_watch_poll(s->fd_in_tag); s->fd_in_tag = 0; } + fd_close_fds(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); return FALSE; } @@ -884,19 +899,27 @@ static void fd_chr_close(struct CharDriverState *chr) g_io_channel_unref(s->fd_out); } + fd_close_fds(s); g_free(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } /* 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 = io_channel_from_fd(fd_in); s->fd_out = io_channel_from_fd(fd_out); + if (close_fds_on_close) { + s->close_fdin = fd_in; + s->close_fdout = fd_out; + } else { + s->close_fdin = s->close_fdout = -1; + } fcntl(fd_out, F_SETFL, O_NONBLOCK); s->chr = chr; chr->opaque = s; @@ -936,7 +959,7 @@ static CharDriverState *qemu_chr_open_pipe(CharDriverState *chr, return NULL; } } - return qemu_chr_open_fd(chr, fd_in, fd_out); + return qemu_chr_open_fd(chr, fd_in, fd_out, TRUE); } /* init terminal so that we can grab keys */ @@ -990,7 +1013,7 @@ static CharDriverState *qemu_chr_open_stdio(CharDriverState *chr, fcntl(0, F_SETFL, O_NONBLOCK); atexit(term_exit); - qemu_chr_open_fd(chr, 0, 1); + qemu_chr_open_fd(chr, 0, 1, FALSE); chr->chr_close = qemu_chr_close_stdio; chr->chr_set_echo = qemu_chr_set_echo_stdio; stdio_allow_signal = display_type != DT_NOGRAPHIC; @@ -1473,7 +1496,7 @@ static void qemu_chr_close_tty(CharDriverState *chr) static CharDriverState *qemu_chr_open_tty_fd(CharDriverState *chr, int fd) { tty_serial_init(fd, 115200, 'N', 8, 1); - qemu_chr_open_fd(chr, fd, fd); + qemu_chr_open_fd(chr, fd, fd, TRUE); chr->chr_ioctl = tty_serial_ioctl; chr->chr_close = qemu_chr_close_tty; return chr; @@ -2561,7 +2584,7 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) #ifndef _WIN32 CharDriverState *qemu_chr_open_eventfd(CharDriverState *chr, int eventfd) { - return qemu_chr_open_fd(chr, eventfd, eventfd); + return qemu_chr_open_fd(chr, eventfd, eventfd, FALSE); } #endif @@ -3692,7 +3715,7 @@ static CharDriverState *qmp_chardev_open_file(CharDriverState *chr, } } - return qemu_chr_open_fd(chr, in, out); + return qemu_chr_open_fd(chr, in, out, TRUE); } static CharDriverState *qmp_chardev_open_serial(CharDriverState *chr,