From: Karel Zak <kzak@redhat.com>
Date: Thu, 7 Jun 2018 10:05:08 +0000 (+0200)
Subject: losetup: keep -f and <devname> mutually exclusive
X-Git-Tag: v2.33-rc1~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3f5a0f1d47dbc47f6d21da232d4eb1cfb7905db;p=thirdparty%2Futil-linux.git

losetup: keep -f and <devname> mutually exclusive

losetup tries to blindly use specified device as well as search for
the first free device, the result is:

 # losetup /dev/loop1 -f /tmp/tfile_loop1
 losetup: /dev/loop1: failed to set up loop device: Invalid argument

fixed version:

 # losetup /dev/loop10 -f img
 losetup: unexpected arguments

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1566432
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 670bce2e39..9eecf06a4c 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -762,6 +762,9 @@ int main(int argc, char **argv)
 		 */
 		act = A_CREATE;
 		file = argv[optind++];
+
+		if (optind < argc)
+			errx(EXIT_FAILURE, _("unexpected arguments"));
 	}
 
 	if (list && !act && optind == argc)