loop-util: fix leak of file descriptor on failure

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index ed237c6f20d7e93ee00bc1438802ec98af39e322..ba818d5371fc962d50a55493e38275edff207660 100644 (file)
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -118,17 +118,19 @@ static int device_has_block_children(sd_device *d) {
 }
 
 static int open_lock_fd(int primary_fd, int operation) {
-        int lock_fd;
+        _cleanup_close_ int lock_fd = -1;
 
         assert(primary_fd >= 0);
+        assert(IN_SET(operation & ~LOCK_NB, LOCK_SH, LOCK_EX));
 
         lock_fd = fd_reopen(primary_fd, O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
         if (lock_fd < 0)
                 return lock_fd;
+
         if (flock(lock_fd, operation) < 0)
                 return -errno;
 
-        return lock_fd;
+        return TAKE_FD(lock_fd);
 }
 
 static int loop_configure(