Merge pull request #338 from ddiss/pdu_cancel_use_after_free

pdu: Fix use after free during cancellation
2020-08-18 07:00:27 -07:00
parent e9cefe7e42 87272919ad
commit 3f50a1462c
1 changed files with 1 additions and 3 deletions
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -788,13 +788,11 @@ iscsi_cancel_pdus(struct iscsi_context *iscsi)
 			pdu->callback(iscsi, SCSI_STATUS_CANCELLED,
 			              NULL, pdu->private_data);
 		}
-		iscsi->drv->free_pdu(iscsi, pdu);
 		if (!(pdu->outdata.data[0] & ISCSI_PDU_IMMEDIATE) &&
 		    (pdu->outdata.data[0] & 0x3f) != ISCSI_PDU_DATA_OUT) {
 			iscsi->cmdsn--;
 		}
-
-
+		iscsi->drv->free_pdu(iscsi, pdu);
 	}
 	while ((pdu = iscsi->waitpdu)) {
 		ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);