locking: avoid descriptor leak for nonblocking mode

When file-locking mode failed on locking, such description was leaked
(typically not an issue since command usually exists afterwards).
So shirt close() at the end of function and use it in all error paths.

Also make sure, when interrrupt is detected, it's really not holding
lock and returns 0.

2 files changed, 9 insertions, 5 deletions

diff --git a/WHATS_NEW b/WHATS_NEW
index c8f072f3c..ac69c16e6 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.174 - 
 =================================
+  Fix leaking of file descriptor for non-blocking filebased locking.
   Fix check for 2nd mda at end of disk fits if using pvcreate --restorefile.
   Use maximum metadataarea size that fits with pvcreate --restorefile.
   Always clear cached bootloaderarea when wiping label e.g. in pvcreate.
diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c
index 22eb128f4..419631314 100644
--- a/lib/misc/lvm-flock.c
+++ b/lib/misc/lvm-flock.c
@@ -116,17 +116,16 @@ static int _do_flock(const char *file, int *fd, int operation, uint32_t nonblock
 		old_errno = errno;
 		if (!nonblock) {
 			sigint_restore();
-			if (sigint_caught())
+			if (sigint_caught()) {
 				log_error("Giving up waiting for lock.");
+				break;
+			}
 		}
 
 		if (r) {
 			errno = old_errno;
 			log_sys_error("flock", file);
-			if (close(*fd))
-				log_sys_debug("close", file);
-			*fd = -1;
-			return 0;
+			break;
 		}
 
 		if (!stat(file, &buf1) && !fstat(*fd, &buf2) &&
@@ -134,6 +133,10 @@ static int _do_flock(const char *file, int *fd, int operation, uint32_t nonblock
 			return 1;
 	} while (!nonblock);
 
+	if (close(*fd))
+		log_sys_debug("close", file);
+	*fd = -1;
+
 	return_0;
 }