admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lib: reserve the fd on reconnect

Browse Source 
On reconnect case, the iscsi_tcp_connect tries to reuse
the fd number of old_iscsi. However, this fd could have been
already closed in previous iscsi_tcp_disconnect if
iscsi->fd == iscsi->old_iscsi->fd and the fd number
might have been allocated to some other caller, in this
case the fd reuse in iscsi_tcp_connect is not safe anymore.

Solve this by not closing the fd if iscsi and old_iscsi
share the same fd on reconnect to "really" reserve this
fd number.

Signed-off-by: Tianren Zhang <tianren@smartx.com>
This commit is contained in:
Tianren Zhang
2024-11-22 05:56:51 +00:00
parent 7d1c926bd6
commit 97ba4c34e2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/socket.c
View File

@@ -416,7 +416,11 @@ iscsi_tcp_disconnect(struct iscsi_context *iscsi)
return -1; return -1;
} }
close(iscsi->fd); if (iscsi->old_iscsi && iscsi->old_iscsi->fd == iscsi->fd) {
/* Reserve this fd because old_iscsi->fd will be reused */
} else {
close(iscsi->fd);
}
if (!(iscsi->pending_reconnect && iscsi->old_iscsi) && if (!(iscsi->pending_reconnect && iscsi->old_iscsi) &&
iscsi->connected_portal[0]) { iscsi->connected_portal[0]) {