libext2fs: fix ext2fs_get_device_size2() return value on Windows

Creating a file system on Windows without a pre-existing file stopped
working because the Windows version of ext2fs_get_device_size2() doesn't
return ENOENT if the file doesn't exist.  Fix this.

Fixes: 53464654bd33 ("mke2fs: fix creating a file system image w/o a pre-existing file")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230301034518.373859-1-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c14250..da44fd0 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,7 +120,6 @@ jobs:
     - run: make -j8 -C lib/support/ all V=1 CFLAGS_WARN="-Werror"
     - run: make -j8 -C lib/e2p/ all V=1 CFLAGS_WARN="-Werror"
     - run: make -j8 -C misc/ mke2fs V=1 CFLAGS_WARN="-Werror"
-    - run: touch image.ext4
     - run: misc/mke2fs.exe -T ext4 image.ext4 128M
     - uses: actions/upload-artifact@v3
       with:

diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index bcf3020..a028634 100644 (file)
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -71,12 +71,11 @@
 #define HAVE_GET_FILE_SIZE_EX 1
 #endif
 
-HANDLE windows_get_handle(io_channel channel);
-
 errcode_t ext2fs_get_device_size2(const char *file, int blocksize,
                                  blk64_t *retblocks)
 {
-       HANDLE dev;
+       int fd;
+       HANDLE h;
        PARTITION_INFORMATION pi;
        DISK_GEOMETRY gi;
        DWORD retbytes;
@@ -86,25 +85,18 @@ errcode_t ext2fs_get_device_size2(const char *file, int blocksize,
        DWORD filesize;
 #endif /* HAVE_GET_FILE_SIZE_EX */
 
-       io_channel data_io = 0;
-       int retval;
-
-       retval = windows_io_manager->open(file, 0, &data_io);
-       if (retval)
-               return retval;
-
-       dev = windows_get_handle(data_io);
-       if (dev == INVALID_HANDLE_VALUE)
-               return EBADF;
-
-       if (DeviceIoControl(dev, IOCTL_DISK_GET_PARTITION_INFO,
+       fd = ext2fs_open_file(file, O_RDONLY, 0);
+       if (fd < 0)
+               return errno;
+       h = (HANDLE)_get_osfhandle(fd);
+       if (DeviceIoControl(h, IOCTL_DISK_GET_PARTITION_INFO,
                            &pi, sizeof(PARTITION_INFORMATION),
                            &pi, sizeof(PARTITION_INFORMATION),
                            &retbytes, NULL)) {
 
                *retblocks = pi.PartitionLength.QuadPart / blocksize;
 
-       } else if (DeviceIoControl(dev, IOCTL_DISK_GET_DRIVE_GEOMETRY,
+       } else if (DeviceIoControl(h, IOCTL_DISK_GET_DRIVE_GEOMETRY,
                                &gi, sizeof(DISK_GEOMETRY),
                                &gi, sizeof(DISK_GEOMETRY),
                                &retbytes, NULL)) {
@@ -115,20 +107,19 @@ errcode_t ext2fs_get_device_size2(const char *file, int blocksize,
                             gi.Cylinders.QuadPart / blocksize;
 
 #ifdef HAVE_GET_FILE_SIZE_EX
-       } else if (GetFileSizeEx(dev, &filesize)) {
+       } else if (GetFileSizeEx(h, &filesize)) {
                *retblocks = filesize.QuadPart / blocksize;
        }
 #else
        } else {
-               filesize = GetFileSize(dev, NULL);
+               filesize = GetFileSize(h, NULL);
                if (INVALID_FILE_SIZE != filesize) {
                        *retblocks = filesize / blocksize;
                }
        }
 #endif /* HAVE_GET_FILE_SIZE_EX */
 
-       windows_io_manager->close(data_io);
-
+       close(fd);
        return 0;
 }
 

diff --git a/lib/ext2fs/windows_io.c b/lib/ext2fs/windows_io.c
index 83aea68..f01bbb6 100644 (file)
--- a/lib/ext2fs/windows_io.c
+++ b/lib/ext2fs/windows_io.c
@@ -857,17 +857,6 @@ static errcode_t windows_write_byte(io_channel channel, unsigned long offset,
        return EXT2_ET_UNIMPLEMENTED;
 }
 
-HANDLE windows_get_handle(io_channel channel)
-{
-       struct windows_private_data *data;
-
-       EXT2_CHECK_MAGIC_RETURN(channel, EXT2_ET_MAGIC_IO_CHANNEL, INVALID_HANDLE_VALUE);
-       data = (struct windows_private_data *) channel->private_data;
-       EXT2_CHECK_MAGIC_RETURN(data, EXT2_ET_MAGIC_WINDOWS_IO_CHANNEL, INVALID_HANDLE_VALUE);
-
-       return data->handle;
-}
-
 /*
  * Flush data buffers to disk.
  */