X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fupload.c;h=7b2ccea55241fbcaffdb8e08b51d7a71989e3f0a;hp=b457695060d0c75978eb70f46c2fe473cd68bdfc;hb=3e70b34eed5a48640e20fbf6dcba774aaace1f3c;hpb=170f262f0413de843af62b968f6d12c1c476ae7f

diff --git a/daemon/upload.c b/daemon/upload.c
index b457695..7b2ccea 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,9 +40,14 @@ do_upload (const char *filename)
 {
   int err, fd, r, is_dev;
 
-  NEED_ROOT_OR_IS_DEVICE (filename, -1);
-
-  is_dev = strncmp (filename, "/dev/", 5) == 0;
+  is_dev = STREQLEN (filename, "/dev/", 5);
+  if (!is_dev) {
+    if (!root_mounted || filename[0] != '/') {
+      cancel_receive ();
+      reply_with_error ("upload: root must be mounted and path must be absolute");
+      return -1;
+    }
+  }
 
   if (!is_dev) CHROOT_IN;
   fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
@@ -61,6 +66,7 @@ do_upload (const char *filename)
     cancel_receive ();
     errno = err;
     reply_with_perror ("write: %s", filename);
+    close (fd);
     return -1;
   }
   if (r == -2) {		/* cancellation from library */
@@ -87,9 +93,7 @@ do_download (const char *filename)
   int fd, r, is_dev;
   char buf[GUESTFS_MAX_CHUNK_SIZE];
 
-  NEED_ROOT_OR_IS_DEVICE (filename, -1);
-
-  is_dev = strncmp (filename, "/dev/", 5) == 0;
+  is_dev = STREQLEN (filename, "/dev/", 5);
 
   if (!is_dev) CHROOT_IN;
   fd = open (filename, O_RDONLY);
@@ -106,13 +110,16 @@ do_download (const char *filename)
   reply (NULL, NULL);
 
   while ((r = read (fd, buf, sizeof buf)) > 0) {
-    if (send_file_write (buf, r) < 0)
+    if (send_file_write (buf, r) < 0) {
+      close (fd);
       return -1;
+    }
   }
 
   if (r == -1) {
     perror (filename);
     send_file_end (1);		/* Cancel. */
+    close (fd);
     return -1;
   }
 
@@ -122,6 +129,8 @@ do_download (const char *filename)
     return -1;
   }
 
-  send_file_end (0);		/* Normal end of file. */
+  if (send_file_end (0))	/* Normal end of file. */
+    return -1;
+
   return 0;
 }