diff options
author | Richard Jones <rjones@redhat.com> | 2010-04-06 11:03:03 +0100 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2010-04-08 22:21:20 +0100 |
commit | d5f98968a48cb8edd269e4865c4a851d187b98e3 (patch) | |
tree | c6e7bb87f0a42f89f26a51bbde1eaf8d05782530 | |
parent | d7bb3540266ab728657420c05b2adeb57218782e (diff) | |
download | libguestfs-d5f98968a48cb8edd269e4865c4a851d187b98e3.tar.gz libguestfs-d5f98968a48cb8edd269e4865c4a851d187b98e3.tar.xz libguestfs-d5f98968a48cb8edd269e4865c4a851d187b98e3.zip |
Check error returns from posix_fallocate (RHBZ#579664).
posix_fallocate has a non-standard way to return error indications.
Thus all our calls to posix_fallocate were effectively unchecked. For
example:
$ guestfish alloc test.img 1P
$ echo $?
0
$ ll test.img
-rw-rw-r--. 1 rjones rjones 0 2010-04-06 11:02 test.img
$ rm test.img
With this change, errors are detected and reported properly:
$ ./fish/guestfish alloc test.img 1P
fallocate: File too large
This is a fix for:
https://bugzilla.redhat.com/show_bug.cgi?id=579664
(cherry picked from commit 2ade61d1f864c75ce65c358e4ac8a012a897b89a)
-rw-r--r-- | daemon/fallocate.c | 8 | ||||
-rw-r--r-- | fish/alloc.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/daemon/fallocate.c b/daemon/fallocate.c index 7f17f8b8..49474307 100644 --- a/daemon/fallocate.c +++ b/daemon/fallocate.c @@ -23,6 +23,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#include <errno.h> #include "daemon.h" #include "actions.h" @@ -41,10 +42,9 @@ do_fallocate (const char *path, int len) } #ifdef HAVE_POSIX_FALLOCATE - int r; - - r = posix_fallocate (fd, 0, len); - if (r == -1) { + int err = posix_fallocate (fd, 0, len); + if (err != 0) { + errno = err; reply_with_perror ("%s", path); close (fd); return -1; diff --git a/fish/alloc.c b/fish/alloc.c index 28c990f1..93cd8afd 100644 --- a/fish/alloc.c +++ b/fish/alloc.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <inttypes.h> +#include <errno.h> #include "fish.h" @@ -55,7 +56,9 @@ do_alloc (const char *cmd, int argc, char *argv[]) } #ifdef HAVE_POSIX_FALLOCATE - if (posix_fallocate (fd, 0, size) == -1) { + int err = posix_fallocate (fd, 0, size); + if (err != 0) { + errno = err; perror ("fallocate"); close (fd); unlink (argv[0]); |