From patchwork Tue Nov 12 16:33:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 290704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 545A62C00AB for ; Wed, 13 Nov 2013 03:34:25 +1100 (EST) Received: from localhost ([::1]:43821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgGv1-0004kX-Dj for incoming@patchwork.ozlabs.org; Tue, 12 Nov 2013 11:34:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgGu9-0004hu-QQ for qemu-devel@nongnu.org; Tue, 12 Nov 2013 11:33:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgGu2-0007JH-8a for qemu-devel@nongnu.org; Tue, 12 Nov 2013 11:33:29 -0500 Received: from mail-oa0-x232.google.com ([2607:f8b0:4003:c02::232]:54050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgGu2-0007I9-3I for qemu-devel@nongnu.org; Tue, 12 Nov 2013 11:33:22 -0500 Received: by mail-oa0-f50.google.com with SMTP id k1so1832704oag.23 for ; Tue, 12 Nov 2013 08:33:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=47UfLDvrBlwRjurnMXexM0ZTmQd5WWUTvwswS5rDC34=; b=xzaE7XJ2o3AURWdyeh7DH/2xDbZqQQVF/a4bLDUnaMK5y0DW5WwZzuQgjOUWMIf23c 4lILMx5mvyTrHCBbV/e25Vej9tIGGleGP9DjJjxA5vIDoSU5A27XwR0CPwBNk6yPWOno crrNutJm8LVal7k34xf6AFl+s36WAV3bXAex8HZdb/9RLoSlCIo9eU6nMhm4HvzD5yS3 gPHOe5gHA282qsZQLc+57TMJkynj52FUexxGzRkJPsqapip8DCPRUWwjqhYU8/3e5y6z ZOy2i5cO5vu8m4XcbNHe6OF5GuDesXY4yAs2qQ9yloonwQL59ainmklbqv2tT2WcFHjV FzLQ== X-Received: by 10.182.81.197 with SMTP id c5mr24775002oby.40.1384274001577; Tue, 12 Nov 2013 08:33:21 -0800 (PST) Received: from t430.minyard.home (pool-173-57-152-84.dllstx.fios.verizon.net. [173.57.152.84]) by mx.google.com with ESMTPSA id hs4sm33798320obb.5.2013.11.12.08.33.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 08:33:20 -0800 (PST) Received: from t430.minyard.home (t430.minyard.home [127.0.0.1]) by t430.minyard.home (8.14.7/8.14.7) with ESMTP id rACGXJTN016608; Tue, 12 Nov 2013 10:33:19 -0600 Received: (from cminyard@localhost) by t430.minyard.home (8.14.7/8.14.7/Submit) id rACGXJIa016606; Tue, 12 Nov 2013 10:33:19 -0600 From: Corey Minyard To: qemu-devel@nongnu.org Date: Tue, 12 Nov 2013 10:33:03 -0600 Message-Id: <1384273995-16486-5-git-send-email-cminyard@mvista.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384273995-16486-1-git-send-email-cminyard@mvista.com> References: <1384273995-16486-1-git-send-email-cminyard@mvista.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::232 Cc: Bret Ketchum , Corey Minyard , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 04/16] 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 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 935066d..08b29ac 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -820,6 +820,8 @@ typedef struct FDCharDriver { GIOChannel *fd_in, *fd_out; 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) @@ -829,6 +831,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; @@ -850,6 +864,7 @@ static gboolean fd_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) len, &bytes_read, NULL); if (status == G_IO_STATUS_EOF) { remove_fd_in_watch(chr); + fd_close_fds(s); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); return FALSE; } @@ -898,19 +913,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; @@ -948,7 +971,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 */ @@ -1001,7 +1024,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; if (opts->has_signal) { @@ -1407,7 +1430,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; @@ -2483,7 +2506,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 @@ -3639,7 +3662,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,