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

CONNECT: connect data is not always malloc()ed so we can demand it is free()able

Browse Source 
After a sync connection, make sure to clear connect_data since it will otherwise
point to a structure on the stack.
This commit is contained in:
Ronnie Sahlberg
2012-08-09 08:27:48 +10:00
parent a98b6e63f0
commit 06cc2d2ece
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/init.c
View File

@@ -244,7 +244,6 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
free(discard_const(iscsi->chap_c)); free(discard_const(iscsi->chap_c));
iscsi->chap_c = NULL; iscsi->chap_c = NULL;
free(iscsi->connect_data);
iscsi->connect_data = NULL; iscsi->connect_data = NULL;
free(iscsi); free(iscsi);

6
lib/socket.c
View File

@@ -68,11 +68,6 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
struct addrinfo *ai = NULL; struct addrinfo *ai = NULL;
int socksize; int socksize;
if (iscsi->connect_data != NULL) {
free(iscsi->connect_data);
}
iscsi->connect_data = private_data;
if (iscsi->fd != -1) { if (iscsi->fd != -1) {
iscsi_set_error(iscsi, iscsi_set_error(iscsi,
"Trying to connect but already connected."); "Trying to connect but already connected.");
@@ -159,6 +154,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
} }
iscsi->socket_status_cb = cb; iscsi->socket_status_cb = cb;
iscsi->connect_data = private_data;
set_nonblocking(iscsi->fd); set_nonblocking(iscsi->fd);

3
lib/sync.c
View File

@@ -97,6 +97,9 @@ iscsi_connect_sync(struct iscsi_context *iscsi, const char *portal)
event_loop(iscsi, &state); event_loop(iscsi, &state);
/* clear connect_data so it doesnt point to our stack */
iscsi->connect_data = NULL;
return state.status; return state.status;
} }