diff options
| author | Stanislav Brabec | 2017-01-12 15:45:27 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-01-16 12:25:45 +0100 |
| commit | 3789806db21dea8e009ceea8f6158bc778151afe (patch) | |
| tree | 1ad67f76362ab89d06b32d539f753ab91bd320c1 /libmount/src/context_loopdev.c | |
| parent | libfdisk: apply label alignment properties (diff) | |
| download | kernel-qcow2-util-linux-3789806db21dea8e009ceea8f6158bc778151afe.tar.gz kernel-qcow2-util-linux-3789806db21dea8e009ceea8f6158bc778151afe.tar.xz kernel-qcow2-util-linux-3789806db21dea8e009ceea8f6158bc778151afe.zip | |
libmount: fix mount -oloop=/dev/loopX regression
If mount option "loop" is used with an argument, it should be respected. Commit
8efad715 introduced a regression. Even with an argument, overlaying loop device
is searched and argument is ignored. It could have unexpected side effects.
If argument is set, never allocate a new loop device.
How to reproduce:
mkdir -p cdrom
mkisofs -o cdrom.iso cdrom/ 2>/dev/null
losetup /dev/loop0 cdrom.iso
strace mount -t auto -o ro,loop=/dev/loop1 cdrom.iso /mnt 2>&1 | grep ^mount
cat /proc/self/mountinfo | grep /mnt
umount /mnt
losetup -d /dev/loop0
mount("/dev/loop0", "/mnt", "iso9660", MS_MGC_VAL|MS_RDONLY, NULL) = 0
327 60 7:0 / /mnt ro,relatime shared:241 - iso9660 /dev/loop0 ro
losetup: /dev/loop0: detach failed: No such device or address
Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>
Diffstat (limited to 'libmount/src/context_loopdev.c')
| -rw-r--r-- | libmount/src/context_loopdev.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c index 8ef183107..18eb2cc56 100644 --- a/libmount/src/context_loopdev.c +++ b/libmount/src/context_loopdev.c @@ -259,7 +259,12 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt) goto done; } rc = 0; - goto success; + /* loop= used with argument. Conflict will occur. */ + if (loopval) { + rc = -MNT_ERR_LOOPOVERLAP; + goto done; + } else + goto success; } default: /* error */ goto done; |