mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Fix iohelper usage with streams opened for read
In b2878ed860ceceec3cd6481424fed0b543b687cd we added the O_NOCTTY flag when opening files in the stream code. Unfortunately a later piece of code was comparing the flags == O_RDONLY, without masking out the non-access mode flags. This broke the iohelper when used with streams for read, since it caused us to attach the stream output pipe to the stream input FD instead of output FD :-( Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
f493d83fbd
commit
a2214c5257
@ -641,7 +641,7 @@ virFDStreamOpenFileInternal(virStreamPtr st,
|
|||||||
virCommandTransferFD(cmd, fd);
|
virCommandTransferFD(cmd, fd);
|
||||||
virCommandAddArgFormat(cmd, "%d", fd);
|
virCommandAddArgFormat(cmd, "%d", fd);
|
||||||
|
|
||||||
if (oflags == O_RDONLY) {
|
if ((oflags & O_ACCMODE) == O_RDONLY) {
|
||||||
childfd = fds[1];
|
childfd = fds[1];
|
||||||
fd = fds[0];
|
fd = fds[0];
|
||||||
virCommandSetOutputFD(cmd, &childfd);
|
virCommandSetOutputFD(cmd, &childfd);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user