system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi: Validate DataSN values in Data-In PDUs in the initiator.

Browse source 
As is done in the target, require that DataSN values are consecutive
and in-order.  If an out of order Data-In PDU is received, force a
session reconnect.  In addition, when a SCSI Response PDU is received,
verify that the ExpDataSN field matches the count of Data-In PDUs
received for this command.  If not, force a session reconnect.

Reviewed by:	mav
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D31594
This commit is contained in:
John Baldwin 2021-08-24 14:58:34 -07:00
parent 71fbc6faed
commit 4f0f5bf995
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/dev/iscsi/iscsi.c
View file

@ -892,6 +892,15 @@ iscsi_pdu_handle_scsi_response(struct icl_pdu *response)
}
ccb = io->io_ccb;
if (ntohl(bhssr->bhssr_expdatasn) != io->io_datasn) {
ISCSI_SESSION_WARN(is,
"ExpDataSN mismatch in SCSI Response (%u vs %u)",
ntohl(bhssr->bhssr_expdatasn), io->io_datasn);
icl_pdu_free(response);
iscsi_session_reconnect(is);
ISCSI_SESSION_UNLOCK(is);
return;
}
/*
* With iSER, after getting good response we can be sure
@ -1047,6 +1056,17 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response)
return;
}
if (io->io_datasn != ntohl(bhsdi->bhsdi_datasn)) {
ISCSI_SESSION_WARN(is, "received Data-In PDU with "
"DataSN %u, while expected %u; dropping connection",
ntohl(bhsdi->bhsdi_datasn), io->io_datasn);
icl_pdu_free(response);
iscsi_session_reconnect(is);
ISCSI_SESSION_UNLOCK(is);
return;
}
io->io_datasn += response->ip_additional_pdus + 1;
data_segment_len = icl_pdu_data_segment_length(response);
if (data_segment_len == 0) {
/*
@ -1096,7 +1116,6 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response)
icl_pdu_get_data(response, 0, csio->data_ptr + oreceived, data_segment_len);
/*
* XXX: Check DataSN.
* XXX: Check F.
*/
if ((bhsdi->bhsdi_flags & BHSDI_FLAGS_S) == 0) {

1
sys/dev/iscsi/iscsi.h
View file

@ -44,6 +44,7 @@ struct iscsi_outstanding {
TAILQ_ENTRY(iscsi_outstanding) io_next;
union ccb *io_ccb;
size_t io_received;
uint32_t io_datasn;
uint32_t io_initiator_task_tag;
uint32_t io_referenced_task_tag;
void *io_icl_prv;