From 934da82913f70ea3c68bcbcd7b184be54c2c2061 Mon Sep 17 00:00:00 2001
From: Rob Landley
Date: Sun, 25 Jun 2006 15:29:12 +0000
Subject: Fix a possible race condition if two processes try to claim the same
 loop device at the same time.  We should only CLR_FD if the set status fails,
 not if the SET_FD fails.

---
 libbb/loop.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libbb')

diff --git a/libbb/loop.c b/libbb/loop.c
index 2f9d029..e5b2164 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -118,9 +118,10 @@ int set_loop(char **device, const char *file, int offset)
 			safe_strncpy((char *)loopinfo.lo_file_name, file, LO_NAME_SIZE);
 			loopinfo.lo_offset = offset;
 			/* Associate free loop device with file.  */
-			if(!ioctl(dfd, LOOP_SET_FD, ffd) &&
-			   !ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo)) rc=0;
-			else ioctl(dfd, LOOP_CLR_FD, 0);
+			if(!ioctl(dfd, LOOP_SET_FD, ffd)) {
+			   if (!ioctl(dfd, BB_LOOP_SET_STATUS, &loopinfo)) rc=0;
+				else ioctl(dfd, LOOP_CLR_FD, 0);
+			}
 
 		/* If this block device already set up right, re-use it.
 		   (Yes this is racy, but associating two loop devices with the same
-- 
cgit v1.1