d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r261752:

Browse Source 
Empty data segment during Login Phase is rather unlikely, but it's
not, by itself, a protocol error.  This fixes interoperability with
OpenBSD initiator.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2014-03-25 12:33:16 +00:00
parent 9a3c8da93d
commit 4a35e9f814
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/ctld/discovery.c
View File

@ -61,9 +61,6 @@ text_receive(struct connection *conn)
*/
if ((bhstr->bhstr_flags & BHSTR_FLAGS_CONTINUE) != 0)
log_errx(1, "received Text PDU with unsupported \"C\" flag");
if (request->pdu_data_len == 0)
log_errx(1, "received Text PDU with empty data segment");
if (ntohl(bhstr->bhstr_cmdsn) < conn->conn_cmdsn) {
log_errx(1, "received Text PDU with decreasing CmdSN: "
"was %d, is %d", conn->conn_cmdsn, ntohl(bhstr->bhstr_cmdsn));

2
usr.sbin/ctld/keys.c
View File

@ -64,7 +64,7 @@ keys_load(struct keys *keys, const struct pdu *pdu)
size_t pair_len;
if (pdu->pdu_data_len == 0)
log_errx(1, "protocol error: empty data segment");
return;
if (pdu->pdu_data[pdu->pdu_data_len - 1] != '\0')
log_errx(1, "protocol error: key not NULL-terminated\n");

4
usr.sbin/ctld/login.c
View File

@ -128,10 +128,6 @@ login_receive(struct connection *conn, bool initial)
log_errx(1, "received Login PDU with unsupported "
"Version-min 0x%x", bhslr->bhslr_version_min);
}
if (request->pdu_data_len == 0) {
login_send_error(request, 0x02, 0x00);
log_errx(1, "received Login PDU with empty data segment");
}
if (ntohl(bhslr->bhslr_cmdsn) < conn->conn_cmdsn) {
login_send_error(request, 0x02, 0x05);
log_errx(1, "received Login PDU with decreasing CmdSN: "