From b3bf5d9634880d8c9d8a247504a6a89436a0afe5 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 10 Jun 2009 13:22:45 +0100 Subject: [PATCH] Fix device tests. --- daemon/guestfsd.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index dc839ce..01a7e48 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -691,30 +692,45 @@ shell_quote (char *out, int len, const char *in) * use the IS_DEVICE macro. * * See guestfs(3) for the algorithm. + * + * We have to open the device and test for ENODEV, because + * the device nodes themselves will exist in the appliance. */ int device_name_translation (char *device, const char *func) { - struct stat statbuf; + int fd; - if (stat (device, &statbuf) == -1) { - /* If the name begins with "/dev/sd" then try the alternatives. */ - if (strncmp (device, "/dev/sd", 7) != 0) - goto error; + fd = open (device, O_RDONLY); + if (fd >= 0) { + close (fd); + return 0; + } - device[5] = 'h'; /* /dev/hd (old IDE driver) */ - if (stat (device, &statbuf) == 0) - return 0; + if (errno != ENODEV) { + error: + reply_with_perror ("%s: %s", func, device); + return -1; + } - device[5] = 'v'; /* /dev/vd (for virtio devices) */ - if (stat (device, &statbuf) == 0) - return 0; + /* If the name begins with "/dev/sd" then try the alternatives. */ + if (strncmp (device, "/dev/sd", 7) != 0) + goto error; - device[5] = 's'; /* Restore original device name. */ + device[5] = 'h'; /* /dev/hd (old IDE driver) */ + fd = open (device, O_RDONLY); + if (fd >= 0) { + close (fd); + return 0; + } - error: - reply_with_perror ("%s: %s", func, device); - return -1; + device[5] = 'v'; /* /dev/vd (for virtio devices) */ + fd = open (device, O_RDONLY); + if (fd >= 0) { + close (fd); + return 0; } - return 0; + + device[5] = 's'; /* Restore original device name. */ + goto error; } -- 1.8.3.1