monitor: Accept input only byte-wise
PATCH 1/1 monitor: Accept input only byte-wise
This allows to suspend command interpretation and execution synchronously, e.g. during migration.
---
monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
monitor.c +1 -1
@@ -3418,7 +3418,7 @@ static int monitor_can_read(void *opaque) {Monitor *mon = opaque; -return (mon->suspend_cnt ==0 ) ?128 :0 ; +return (mon->suspend_cnt ==0 ) ?1 :0 ; }static void monitor_read (void *opaque,const uint8_t *buf,int size)
Quoted 14 lines · Jan Kiszka
This allows to suspend command interpretation and execution synchronously, e.g. during migration.
Signed-off-by Jan Kiszka <[email protected]>---
monitor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)monitor.c +0
-0
monitor.c static int monitor_can_read(void *opaque) · line 3424
Quoted 8 lines
monitor.c +1
-1@@ -3418,7 +3418,7 @@ static int monitor_can_read(void *opaque) {Monitor *mon = opaque; -return (mon->suspend_cnt ==0 ) ?128 :0 ; +return (mon->suspend_cnt ==0 ) ?1 :0 ; }static void monitor_read (void *opaque,const uint8_t *buf,int size)
FYI, this change seems to have broken the 'getfd' command in the monitor. Any attempt to use this command (in both text + json modes) is currently returning
"No file descriptor supplied via SCM_RIGHTS"
Reverting this change makes getfd work again for me.
Strace of libvirtd shows it sending the command + FD in one message:
sendmsg(18, {msg_name(0)=NULL, msg_iov(1)=[{"getfd fd-net2\r", 14}],
msg_controllen=24, {cmsg_len=20, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS,
{16}}, msg_flags=0}, 0) = 14
Strace of qemu shows that it receives the FD ok, but immediately closes it before finishing reading the actual monitor command with which it is associated:
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"g", 1}], msg_controllen=24, {cmsg_len=20, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, {17}}, msg_flags=0}, 0) = 1
[pid 31941] close(17) = 0
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"e", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"t", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"f", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"d", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{" ", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"f", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"d", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"-", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"n", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"e", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"t", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"2", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
[pid 31941] recvmsg(16, {msg_name(0)=NULL, msg_iov(1)=[{"\r", 1}], msg_controllen=0, msg_flags=0}, 0) = 1
The QEMU code appears to be written to assume that it will recvmsg() a complete monitor command in one go + process that, because it closes the FD the moment the data from any recvmsg() is dealt with.
Regards,
Daniel
Signature · 4 lines
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
Quoted 4 lines
The QEMU code appears to be written to assume that it will
recvmsg()a complete monitor command in one go + process that, because it closes the FD the moment the data from anyrecvmsg()is dealt with.
This is buggy anyway. This should fix it too:
monitor.c +0 -9
@@ -2408,15 +2408,6 @@return -1 ; } - fd =dup (fd); -if (fd ==-1 ) { -if (errno ==EMFILE ) -qerror_report (QERR_TOO_MANY_FILES ); -else -qerror_report (QERR_UNDEFINED_ERROR ); -return -1 ; - } - QLIST_FOREACH(monfd, &mon->fds, next) {if (strcmp (monfd->name, fdname) !=0 ) {continue ;
qemu-char.c +3 -6
@@ -2000,8 +2000,9 @@static int tcp_get_msgfd (CharDriverState *chr) {TCPCharDriver *s = chr->opaque; - -return s->msgfd; +int fd = s->msgfd; + s->msgfd =-1 ; +return fd; }#ifndef _WIN32
@@ -2089,10 +2090,6 @@ static void tcp_chr_read(void *opaque)tcp_chr_process_IAC_bytes (chr, s, buf, &size);if (size >0 )qemu_chr_read (chr, buf, size); -if (s->msgfd !=-1 ) { -close (s->msgfd); - s->msgfd =-1 ; - } } }
Paolo
Quoted 6 lines · Paolo Bonzini
Quoted 4 lines
The QEMU code appears to be written to assume that it will
recvmsg()a complete monitor command in one go + process that, because it closes the FD the moment the data from anyrecvmsg()is dealt with.This is buggy anyway. This should fix it too:
Yep, this makes it work too, but if a client is evil they could pass a FD to qemu with any other non-getfd command & it'd remain open for ever. Probably not important though.
Daniel
Signature · 4 lines
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
Quoted 11 lines · Daniel P. Berrange
Quoted 6 lines · Paolo Bonzini
Quoted 4 lines
The QEMU code appears to be written to assume that it will
recvmsg()a complete monitor command in one go + process that, because it closes the FD the moment the data from anyrecvmsg()is dealt with.This is buggy anyway. This should fix it too:
Yep, this makes it work too, but if a client is evil they could pass a FD to qemu with any other non-getfd command& it'd remain open for ever. Probably not important though.
No, it wouldn't: outside the part that I patched there is this:
if (s->msgfd != -1)
close(s->msgfd);
s->msgfd = fd;Only one file descriptor could "leak".
Paolo
PATCH 1/1 stash away SCM_RIGHTS fd until a getfd command arrives
In reply to Daniel P. BerrangeIf there is already a fd in s->msgfd before recvmsg it is closed by parts that this patch does not touch. So, only one descriptor can be "leaked" by attaching it to a command other than getfd.
--- monitor.c | 9 --------- qemu-char.c | 9 +++------ 2 files changed, 3 insertions(+), 15 deletions(-)
Tested by Daniel, identical to the previous one except for the Signed-off-by line.
monitor.c +0 -9
@@ -2408,15 +2408,6 @@ static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data)return -1 ; } - fd =dup (fd); -if (fd ==-1 ) { -if (errno ==EMFILE ) -qerror_report (QERR_TOO_MANY_FILES ); -else -qerror_report (QERR_UNDEFINED_ERROR ); -return -1 ; - } - QLIST_FOREACH(monfd, &mon->fds, next) {if (strcmp (monfd->name, fdname) !=0 ) {continue ;
qemu-char.c +3 -6
@@ -2000,8 +2000,9 @@ static void tcp_chr_process_IAC_bytes(CharDriverState *chr,static int tcp_get_msgfd (CharDriverState *chr) {TCPCharDriver *s = chr->opaque; - -return s->msgfd; +int fd = s->msgfd; + s->msgfd =-1 ; +return fd; }#ifndef _WIN32
@@ -2089,10 +2090,6 @@ static void tcp_chr_read(void *opaque)tcp_chr_process_IAC_bytes (chr, s, buf, &size);if (size >0 )qemu_chr_read (chr, buf, size); -if (s->msgfd !=-1 ) { -close (s->msgfd); - s->msgfd =-1 ; - } } }
Signature · 1 line
1.6.6.1