mkfs.cramfs: Properly check mmap results

The POSIX manual page states that the error return value is MAP_FAILED.
Sync with all other mmap checks throughout util-linux.

Also, test an mmap call which previously was not tested.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 0b6e04de6d67e9e35a8d3e47c9fb0d14349bf2ff..b456db6a510463b55d58cdf3e769430bf0006c90 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -663,6 +663,8 @@ static unsigned int write_file(char *file, char *base, unsigned int offset)
        if (fd < 0)
                err(MKFS_EX_ERROR, _("cannot open %s"), file);
        buf = mmap(NULL, image_length, PROT_READ, MAP_PRIVATE, fd, 0);
+       if (buf == MAP_FAILED)
+               err(MKFS_EX_ERROR, _("cannot map %s"), file);
        memcpy(base + offset, buf, image_length);
        munmap(buf, image_length);
        if (close (fd) < 0)
@@ -853,7 +855,7 @@ int main(int argc, char **argv)
                         MAP_PRIVATE | MAP_ANONYMOUS,
                         -1, 0);
 
-       if (-1 == (int) (long) rom_image)
+       if (MAP_FAILED == rom_image)
                err(MKFS_EX_ERROR, _("ROM image map"));
 
        /* Skip the first opt_pad bytes for boot loader code */