From patchwork Wed Mar 5 00:38:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 326559 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 99CE62C020F for ; Wed, 5 Mar 2014 12:10:26 +1100 (EST) Received: from localhost ([::1]:49478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKzuN-0006Le-03 for incoming@patchwork.ozlabs.org; Tue, 04 Mar 2014 19:42:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKztG-00056Z-GD for qemu-devel@nongnu.org; Tue, 04 Mar 2014 19:41:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKztA-0000qH-LH for qemu-devel@nongnu.org; Tue, 04 Mar 2014 19:40:54 -0500 Received: from mail-oa0-x22a.google.com ([2607:f8b0:4003:c02::22a]:38224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKztA-0000qC-Ez for qemu-devel@nongnu.org; Tue, 04 Mar 2014 19:40:48 -0500 Received: by mail-oa0-f42.google.com with SMTP id i4so327501oah.29 for ; Tue, 04 Mar 2014 16:40:47 -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=8lp8AcVY6X9vSSITdMVFfD2XDmnoZWza2SlJlVn3xhY=; b=MYp1J2DqPH+43M4wSMMe+JaDcOP7ewbCWE4ArIaC1Qp6tZ7/3YFV7bN09N+iGKtyiX qgnwL/c+KIpXwKUw7oD5cRNFPtsziXynNp55SXEXQwKpwnJ8MG7xWdg7c2p+ru0mSkaB gk2AljvcPK7HdkTEBWKl1xXPauC24aGVuzmmJXwgg0Fj2handq0bTkvzAEOuWWCvmcOp qM4UtyFX70s8IhWfIAHw4I1xIsjDKgg/vXAVIgEel30E1X/XZqGpnPZE0afLdfoRtv0a k7kSnsDt3LHxq0Xwx3NRTU7Q7dRcz9YtiyYUKwv3XlAaUS7w3rOkJtxFbLEehCDtNOmV zrdg== X-Received: by 10.182.225.137 with SMTP id rk9mr77631obc.51.1393980047679; Tue, 04 Mar 2014 16:40:47 -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 tz6sm1608220obc.10.2014.03.04.16.40.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Mar 2014 16:40:46 -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 s250eZ28009974; Tue, 4 Mar 2014 18:40:45 -0600 Received: (from cminyard@localhost) by t430.minyard.home (8.14.7/8.14.7/Submit) id s250ePOI009964; Tue, 4 Mar 2014 18:40:25 -0600 From: minyard@acm.org To: qemu-devel@nongnu.org Date: Tue, 4 Mar 2014 18:38:55 -0600 Message-Id: <1393979937-9082-6-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1393979937-9082-1-git-send-email-minyard@acm.org> References: <1393979937-9082-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::22a Cc: bcketchum@gmail.com, Corey Minyard , hwd@huawei.com, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 5/7] 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 4ac131d..427bb34 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -851,6 +851,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) @@ -860,6 +862,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; @@ -881,6 +895,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; } @@ -929,19 +944,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; @@ -979,7 +1002,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 */ @@ -1032,7 +1055,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) { @@ -1438,7 +1461,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; @@ -2514,7 +2537,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 @@ -3769,7 +3792,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,