[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/20] qemu-char: Close fd at end of file
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 05/20] qemu-char: Close fd at end of file |
Date: |
Wed, 29 May 2013 17:08:01 -0500 |
From: Corey Minyard <address@hidden>
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 <address@hidden>
---
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,
--
1.7.9.5
- [Qemu-devel] [PATCH 00/20] Add an IPMI device to QEMU, minyard, 2013/05/29
- [Qemu-devel] [PATCH 04/20] qemu-char: remove free of chr from win_stdio_close, minyard, 2013/05/29
- [Qemu-devel] [PATCH 03/20] qemu-char: Fix a race reporting opens and closes, minyard, 2013/05/29
- [Qemu-devel] [PATCH 13/20] ipmi: Add documentation, minyard, 2013/05/29
- [Qemu-devel] [PATCH 05/20] qemu-char: Close fd at end of file,
minyard <=
- [Qemu-devel] [PATCH 02/20] qemu-char: Allow a chardev to reconnect if disconnected, minyard, 2013/05/29
- [Qemu-devel] [PATCH 15/20] acpi: Add a way to extend tables, minyard, 2013/05/29
- [Qemu-devel] [PATCH 06/20] Add a base IPMI interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 19/20] smbios: Add a function to directly add an entry, minyard, 2013/05/29
- [Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry, minyard, 2013/05/29
- [Qemu-devel] [PATCH 07/20] ipmi: Add a PC ISA type structure, minyard, 2013/05/29
- [Qemu-devel] [PATCH 18/20] ipmi: Add ACPI table entries for BMCs, minyard, 2013/05/29
- [Qemu-devel] [PATCH 09/20] ipmi: Add a BT low-level interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 08/20] ipmi: Add a KCS low-level interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 01/20] qemu-char: Allocate CharDriverState in qemu_chr_new_from_opts, minyard, 2013/05/29