External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handling of readdir() in virFileLoopDeviceOpen

Browse Source 
To correctly handle errors from readdir() you must set 'errno'
to zero before invoking it & check its value afterwards to
distinguish error from EOF.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-05-03 14:26:56 +01:00
parent c8fa7e8c55
commit 1eeff53d7d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/virfile.c
View File

@ -546,6 +546,7 @@ static int virFileLoopDeviceOpen(char **dev_name)
goto cleanup;
}
errno = 0;
while ((de = readdir(dh)) != NULL) {
if (!STRPREFIX(de->d_name, "loop"))
continue;
@ -577,10 +578,15 @@ static int virFileLoopDeviceOpen(char **dev_name)
/* Oh well, try the next device */
VIR_FORCE_CLOSE(fd);
VIR_FREE(looppath);
errno = 0;
}
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to find a free loop device in /dev"));
if (errno != 0)
virReportSystemError(errno, "%s",
_("Unable to iterate over loop devices"));
else
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to find a free loop device in /dev"));
cleanup:
if (fd != -1) {