External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

virfile: Need to check for ENOTCONN from recvfd failure

Browse Source 
A gnulib change (commit id 'beae0bdc') causes ENOTCONN to be returned
from recvfd which causes us to fall into the throwaway waitpid() call
and return ENOTCONN to the caller, this then gets displayed during
a 'virsh save' when using a root squashed NFS environment that's trying
to save the file as something other than root:root.

This patch will add the additional check for ENOTCONN to force the code
into the waitpid loop looking for the actual status from the _exit()'d
child fork.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2015-01-27 19:03:12 -05:00
parent 8ff383366b
commit 29946e3e53
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/virfile.c
View File

@ -2125,7 +2125,8 @@ virFileOpenForked(const char *path, int openflags, mode_t mode,
} while (fd < 0 && errno == EINTR);
VIR_FORCE_CLOSE(pair[0]); /* NB: this preserves errno */
if (fd < 0 && errno != EACCES) {
/* gnulib will return ENOTCONN in certain instances */
if (fd < 0 && !(errno == EACCES || errno == ENOTCONN)) {
ret = -errno;
while (waitpid(pid, NULL, 0) == -1 && errno == EINTR);
return ret;