All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Jagannathan Raman" <jag.raman@oracle.com>,
	"Zhao Liu" <zhao1.liu@intel.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Hanna Reitz" <hreitz@redhat.com>,
	"Gustavo Romero" <gustavo.romero@linaro.org>,
	"Thanos Makatos" <thanos.makatos@nutanix.com>,
	"Cédric Le Goater" <clg@redhat.com>,
	"Darren Kenny" <darren.kenny@oracle.com>,
	"Stefano Garzarella" <sgarzare@redhat.com>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	qemu-block@nongnu.org, "Peter Xu" <peterx@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
	"John Levon" <john.levon@nutanix.com>,
	"Fam Zheng" <fam@euphon.net>, "Alexander Bulekov" <alxndr@bu.edu>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Coiby Xu" <Coiby.Xu@gmail.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Qiuhao Li" <Qiuhao.Li@outlook.com>,
	"Michael Roth" <michael.roth@amd.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Bandan Das" <bsd@redhat.com>,
	"Kostiantyn Kostiuk" <kkostiuk@redhat.com>,
	"Hailiang Zhang" <zhanghailiang@xfusion.com>
Subject: [PULL 15/16] chardev: close an fd on failure path
Date: Fri, 19 Sep 2025 12:50:16 +0100	[thread overview]
Message-ID: <20250919115017.1536203-16-berrange@redhat.com> (raw)
In-Reply-To: <20250919115017.1536203-1-berrange@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

There are at least two failure paths, where we forget
to close an fd.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 chardev/char-pty.c    | 1 +
 chardev/char-serial.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index fe6bfb043d..b066f01412 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -350,6 +350,7 @@ static void char_pty_open(Chardev *chr,
 
     close(slave_fd);
     if (!qemu_set_blocking(master_fd, false, errp)) {
+        close(master_fd);
         return;
     }
 
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index c622d758db..4c6ca713eb 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -272,6 +272,7 @@ static void qmp_chardev_open_serial(Chardev *chr,
         return;
     }
     if (!qemu_set_blocking(fd, false, errp)) {
+        close(fd);
         return;
     }
     tty_serial_init(fd, 115200, 'N', 8, 1);
-- 
2.50.1



  parent reply	other threads:[~2025-09-19 11:55 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-19 11:50 [PULL 00/16] Treewide I/O handle cleanup Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 01/16] MAINTAINERS: list qemu-security@nongnu.org as security contact Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 02/16] migration/qemu-file: don't make incoming fds blocking again Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 03/16] io/channel: document how qio_channel_readv_full() handles fds Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 04/16] char-socket: tcp_chr_recv(): drop extra _set_(block, cloexec) Daniel P. Berrangé via
2025-09-19 11:50 ` [PULL 05/16] char-socket: tcp_chr_recv(): add comment Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 06/16] util: add qemu_set_blocking() function Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 07/16] treewide: handle result of qio_channel_set_blocking() Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 08/16] migration: qemu_file_set_blocking(): add errp parameter Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 09/16] util: drop qemu_socket_set_nonblock() Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 10/16] util: drop qemu_socket_try_set_nonblock() Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 11/16] io/channel-socket: rework qio_channel_socket_copy_fds() Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 12/16] util: drop qemu_socket_set_block() Daniel P. Berrangé
2025-09-19 11:50 ` [PULL 13/16] treewide: use qemu_set_blocking instead of g_unix_set_fd_nonblocking Daniel P. Berrangé
2025-09-22 13:40   ` Peter Maydell
2025-09-22 14:19     ` Vladimir Sementsov-Ogievskiy
2025-09-19 11:50 ` [PULL 14/16] chardev: qemu_chr_open_fd(): add errp Daniel P. Berrangé
2025-09-22 13:45   ` Peter Maydell
2025-09-22 14:27     ` Vladimir Sementsov-Ogievskiy
2025-10-14 12:52       ` Peter Maydell
2025-10-14 13:20         ` Vladimir Sementsov-Ogievskiy
2025-09-22 14:29     ` Daniel P. Berrangé
2025-09-19 11:50 ` Daniel P. Berrangé [this message]
2025-09-19 11:50 ` [PULL 16/16] util/vhost-user-server: vu_message_read(): improve error handling Daniel P. Berrangé
2025-09-19 20:47 ` [PULL 00/16] Treewide I/O handle cleanup Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250919115017.1536203-16-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=Coiby.Xu@gmail.com \
    --cc=Qiuhao.Li@outlook.com \
    --cc=alxndr@bu.edu \
    --cc=bsd@redhat.com \
    --cc=clg@redhat.com \
    --cc=darren.kenny@oracle.com \
    --cc=eblake@redhat.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=fam@euphon.net \
    --cc=farosas@suse.de \
    --cc=gustavo.romero@linaro.org \
    --cc=hreitz@redhat.com \
    --cc=jag.raman@oracle.com \
    --cc=jasowang@redhat.com \
    --cc=john.levon@nutanix.com \
    --cc=kkostiuk@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=michael.roth@amd.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=sw@weilnetz.de \
    --cc=thanos.makatos@nutanix.com \
    --cc=vsementsov@yandex-team.ru \
    --cc=zhanghailiang@xfusion.com \
    --cc=zhao1.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.