emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount: if we race with other loop mount, we forget to close loop dev

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-17 23:38:06 +01:00
parent 251e08ffa6
commit 15733cb48e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libbb/loop.c
View File

@ -187,7 +187,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
//TODO: add "if (--failcount != 0) ..."? //TODO: add "if (--failcount != 0) ..."?
goto get_free_loopN; goto get_free_loopN;
} }
goto try_next_loopN; goto close_and_try_next_loopN;
} }
memset(&loopinfo, 0, sizeof(loopinfo)); memset(&loopinfo, 0, sizeof(loopinfo));
safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE); 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 ioctl(lfd, LOOP_CLR_FD, 0); // actually, 0 param is unnecessary
} }
/* else: device is not free (rc == 0) or error other than ENXIO */ /* else: device is not free (rc == 0) or error other than ENXIO */
close_and_try_next_loopN:
close(lfd); close(lfd);
try_next_loopN: try_next_loopN:
rc = -1; rc = -1;