[git commit] mount: if we race with other loop mount, we forget to close loop dev

Denys Vlasenko vda.linux at googlemail.com
Thu Dec 17 22:38:06 UTC 2020


commit: https://git.busybox.net/busybox/commit/?id=15733cb48e570716cad6ece2d752507ecd767131
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/loop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libbb/loop.c b/libbb/loop.c
index 153990998..cb8fa2442 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -187,7 +187,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 //TODO: add "if (--failcount != 0) ..."?
 					goto get_free_loopN;
 				}
-				goto try_next_loopN;
+				goto close_and_try_next_loopN;
 			}
 			memset(&loopinfo, 0, sizeof(loopinfo));
 			safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
@@ -220,6 +220,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 			ioctl(lfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
 		}
 		/* else: device is not free (rc == 0) or error other than ENXIO */
+ close_and_try_next_loopN:
 		close(lfd);
  try_next_loopN:
 		rc = -1;


More information about the busybox-cvs mailing list