From: Karel Zak Date: Wed, 28 Jul 2021 09:05:36 +0000 (+0200) Subject: losetup: use LOOP_CONFIGURE in a more robust way X-Git-Tag: v2.38-rc1~338 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=583990d25b5d65a9a9771a39d112de0ee16a1f3a;p=thirdparty%2Futil-linux.git losetup: use LOOP_CONFIGURE in a more robust way 32-bit userspace returns ENOTTY: ioctl(4, LOOP_CONFIGURE, {fd=3, block_size=0, info={lo_offset=0, lo_number=0, lo_flags=LO_FLAGS_AUTOCLEAR, lo_file_name="/usr/install/iso/systemrescue-8.04-amd64.iso", ...}}) = -1 ENOTTY (Inappropriate ioctl for device) 64-bit userspace returns EINVAL: ioctl(4, LOOP_CONFIGURE, {fd=3, block_size=0, info={lo_offset=0, lo_number=0, lo_flags=LO_FLAGS_AUTOCLEAR, lo_file_name="/usr/src/PACKAGES/systemrescue-8.04-amd64.iso", ...}}) = -1 EINVAL (Invalid argument) The correct return value for an unknown ioctl is ENOTTY, but we need to support already released kernels, so let's support both errnos. Reported-by: Krzysztof Olędzki Signed-off-by: Karel Zak --- diff --git a/lib/loopdev.c b/lib/loopdev.c index 1eef15d896..d9ea1d4a22 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -1360,7 +1360,7 @@ int loopcxt_setup_device(struct loopdev_cxt *lc) if (ioctl(dev_fd, LOOP_CONFIGURE, &lc->config) < 0) { rc = -errno; errsv = errno; - if (errno != EINVAL) { + if (errno != EINVAL && errno != ENOTTY) { DBG(SETUP, ul_debugobj(lc, "LOOP_CONFIGURE failed: %m")); goto err; }