ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi: Handle spdk_get_pdu() failure in spdk_iscsi_op_text()

Browse Source 
Prepares spdk_iscsi_op_text() to handle the case where
spdk_get_pdu() will return NULL in a future patch instead
of abort()'ing.

Change-Id: I21036116936c50c5674e0d11bbb4a30938bf5336
Signed-off-by: Lance Hartmann <lance.hartmann@oracle.com>
Reviewed-on: https://review.gerrithub.io/403860
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Lance Hartmann 2018-03-14 12:20:38 -04:00 committed by Jim Harris
parent cb7661cdec
commit a37939694c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/iscsi/iscsi.c
View File

@ -2394,6 +2394,7 @@ spdk_iscsi_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
} else {
if (spdk_iscsi_param_eq_val(conn->sess->params,
"SessionType", "Discovery")) {
spdk_iscsi_param_free(*params_p);
free(data);
return SPDK_ISCSI_CONNECTION_FATAL;
}
@ -2403,6 +2404,11 @@ spdk_iscsi_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
/* response PDU */
rsp_pdu = spdk_get_pdu();
if (rsp_pdu == NULL) {
spdk_iscsi_param_free(*params_p);
free(data);
return SPDK_ISCSI_CONNECTION_FATAL;
}
rsph = (struct iscsi_bhs_text_resp *)&rsp_pdu->bhs;
rsp_pdu->data = data;