[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.4 4/4] chardev: clear O_NONBLOCK on SCM_RIG
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH stable-1.4 4/4] chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors |
Date: |
Thu, 4 Apr 2013 13:40:15 +0200 |
When we receive a file descriptor over a UNIX domain socket the
O_NONBLOCK flag is preserved. Clear the O_NONBLOCK flag and rely on
QEMU file descriptor users like migration, SPICE, VNC, block layer, and
others to set non-blocking only when necessary.
This change ensures we don't accidentally expose O_NONBLOCK in the QMP
API. QMP clients should not need to get the non-blocking state
"correct".
A recent real-world example was when libvirt passed a non-blocking TCP
socket for migration where we expected a blocking socket. The source
QEMU produced a corrupted migration stream since its code did not cope
with non-blocking sockets.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-char.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index d685139..1efca64 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2252,6 +2252,9 @@ static void unix_process_msgfd(CharDriverState *chr,
struct msghdr *msg)
if (fd < 0)
continue;
+ /* O_NONBLOCK is preserved across SCM_RIGHTS so reset it */
+ qemu_set_block(fd);
+
#ifndef MSG_CMSG_CLOEXEC
qemu_set_cloexec(fd);
#endif
--
1.8.1.4
- [Qemu-devel] [PATCH stable-1.4 0/4] monitor: do not rely on O_NONBLOCK for passed file descriptors, Stefan Hajnoczi, 2013/04/04
- [Qemu-devel] [PATCH stable-1.4 2/4] net: ensure "socket" backend uses non-blocking fds, Stefan Hajnoczi, 2013/04/04
- [Qemu-devel] [PATCH stable-1.4 4/4] chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH stable-1.4 1/4] oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock(), Stefan Hajnoczi, 2013/04/04
- [Qemu-devel] [PATCH stable-1.4 3/4] qemu-socket: set passed fd non-blocking in socket_connect(), Stefan Hajnoczi, 2013/04/04
- Re: [Qemu-devel] [PATCH stable-1.4 0/4] monitor: do not rely on O_NONBLOCK for passed file descriptors, Eric Blake, 2013/04/04
- Re: [Qemu-devel] [PATCH stable-1.4 0/4] monitor: do not rely on O_NONBLOCK for passed file descriptors, Stefan Hajnoczi, 2013/04/04