daemon: debug segv correct use of dereferencing NULL.

[libguestfs.git] / daemon / fallocate.c

diff --git a/daemon/fallocate.c b/daemon/fallocate.c
index 1800292..bc744f5 100644 (file)
--- a/daemon/fallocate.c
+++ b/daemon/fallocate.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "daemon.h"
 #include "actions.h"
@@ -30,22 +31,32 @@
 int
 do_fallocate (const char *path, int len)
 {
+  if (len < 0) {
+    reply_with_error ("length < 0");
+    return -1;
+  }
+
+  return do_fallocate64 (path, len);
+}
+
+int
+do_fallocate64 (const char *path, int64_t len)
+{
   int fd;
 
   CHROOT_IN;
   fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_NOCTTY, 0666);
   CHROOT_OUT;
   if (fd == -1) {
-    reply_with_perror ("failed to open %s", path);
+    reply_with_perror ("open: %s", path);
     return -1;
   }
 
 #ifdef HAVE_POSIX_FALLOCATE
-  int r;
-
-  r = posix_fallocate (fd, 0, len);
-  if (r == -1) {
-    reply_with_perror ("posix_fallocate: %s", path);
+  int err = posix_fallocate (fd, 0, len);
+  if (err != 0) {
+    errno = err;
+    reply_with_perror ("%s", path);
     close (fd);
     return -1;
   }