|
 |
47585c |
From 5504053cc08df38d8d85032fa1691e363dfcfb92 Mon Sep 17 00:00:00 2001
|
|
|
47585c |
From: Lee Duncan <lduncan@suse.com>
|
|
|
47585c |
Date: Fri, 15 Dec 2017 11:13:29 -0800
|
|
|
47585c |
Subject: [PATCH] Do not double-close IPC file stream to iscsid
|
|
|
47585c |
|
|
|
47585c |
A double-close of a file descriptor and its associated FILE stream
|
|
|
47585c |
can be an issue in multi-threaded cases. Found by Qualsys.
|
|
|
47585c |
---
|
|
|
47585c |
iscsiuio/src/unix/iscsid_ipc.c | 9 +++++++--
|
|
|
47585c |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
47585c |
|
|
|
47585c |
diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c
|
|
|
47585c |
index c3b10e03774a..4a6687b32a17 100644
|
|
|
47585c |
--- a/iscsiuio/src/unix/iscsid_ipc.c
|
|
|
47585c |
+++ b/iscsiuio/src/unix/iscsid_ipc.c
|
|
|
47585c |
@@ -908,6 +908,9 @@ early_exit:
|
|
|
47585c |
/**
|
|
|
47585c |
* process_iscsid_broadcast() - This function is used to process the
|
|
|
47585c |
* broadcast messages from iscsid
|
|
|
47585c |
+ *
|
|
|
47585c |
+ * s2 is an open file descriptor, which
|
|
|
47585c |
+ * must not be left open upon return
|
|
|
47585c |
*/
|
|
|
47585c |
int process_iscsid_broadcast(int s2)
|
|
|
47585c |
{
|
|
|
47585c |
@@ -923,6 +926,7 @@ int process_iscsid_broadcast(int s2)
|
|
|
47585c |
if (fd == NULL) {
|
|
|
47585c |
LOG_ERR(PFX "Couldn't open file descriptor: %d(%s)",
|
|
|
47585c |
errno, strerror(errno));
|
|
|
47585c |
+ close(s2);
|
|
|
47585c |
return -EIO;
|
|
|
47585c |
}
|
|
|
47585c |
|
|
|
47585c |
@@ -1025,7 +1029,8 @@ int process_iscsid_broadcast(int s2)
|
|
|
47585c |
}
|
|
|
47585c |
|
|
|
47585c |
error:
|
|
|
47585c |
- free(data);
|
|
|
47585c |
+ if (data)
|
|
|
47585c |
+ free(data);
|
|
|
47585c |
fclose(fd);
|
|
|
47585c |
|
|
|
47585c |
return rc;
|
|
|
47585c |
@@ -1127,8 +1132,8 @@ static void *iscsid_loop(void *arg)
|
|
|
47585c |
break;
|
|
|
47585c |
}
|
|
|
47585c |
|
|
|
47585c |
+ /* this closes the file descriptor s2 */
|
|
|
47585c |
process_iscsid_broadcast(s2);
|
|
|
47585c |
- close(s2);
|
|
|
47585c |
}
|
|
|
47585c |
|
|
|
47585c |
pthread_cleanup_pop(0);
|
|
|
47585c |
--
|
|
|
47585c |
2.17.2
|
|
|
47585c |
|