[git commit] loop: restore the correct return vaule of set_loop()

Denys Vlasenko vda.linux at googlemail.com
Tue Dec 13 14:52:52 UTC 2022


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

It is only used by mount's error path, though...

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

diff --git a/libbb/loop.c b/libbb/loop.c
index e930b1b1f..ffc8acd39 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -147,10 +147,8 @@ static int set_loopdev_params(int lfd,
 		loopinfo.lo_offset = offset;
 		loopinfo.lo_sizelimit = sizelimit;
 		/*
-		 * Used by mount to set LO_FLAGS_AUTOCLEAR.
-		 * LO_FLAGS_READ_ONLY is not set because RO is controlled by open type of the file.
-		 * Note that closing LO_FLAGS_AUTOCLEARed lfd before mount
-		 * is wrong (would free the loop device!)
+		 * LO_FLAGS_READ_ONLY is not set because RO is controlled
+		 * by open type of the lfd.
 		 */
 		loopinfo.lo_flags = (flags & ~BB_LO_FLAGS_READ_ONLY);
 
@@ -266,6 +264,12 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 			/* SUCCESS! */
 			if (!*device)
 				*device = xstrdup(dev);
+			/* Note: mount asks for LO_FLAGS_AUTOCLEAR loopdev.
+			 * Closing LO_FLAGS_AUTOCLEARed lfd before mount
+			 * is wrong (would free the loop device!),
+			 * this is why we return without closing it.
+			 */
+			rc = lfd; /* return this */
 			break;
 		}
 		close(lfd);


More information about the busybox-cvs mailing list