Date: Thu, 6 Mar 2014 11:14:36 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262845 - stable/10/usr.sbin/iscsid Message-ID: <201403061114.s26BEa3G051564@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Thu Mar 6 11:14:36 2014 New Revision: 262845 URL: http://svnweb.freebsd.org/changeset/base/262845 Log: MFC r261747: Empty data segment during Login Phase is rather unlikely, but it's not a protocol error. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/iscsid/discovery.c stable/10/usr.sbin/iscsid/keys.c stable/10/usr.sbin/iscsid/login.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/iscsid/discovery.c ============================================================================== --- stable/10/usr.sbin/iscsid/discovery.c Thu Mar 6 11:13:26 2014 (r262844) +++ stable/10/usr.sbin/iscsid/discovery.c Thu Mar 6 11:14:36 2014 (r262845) @@ -62,8 +62,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 (response->pdu_data_len == 0) - log_errx(1, "received Text PDU with empty data segment"); if (ntohl(bhstr->bhstr_statsn) != conn->conn_statsn + 1) { log_errx(1, "received Text PDU with wrong StatSN: " "is %d, should be %d", ntohl(bhstr->bhstr_statsn), Modified: stable/10/usr.sbin/iscsid/keys.c ============================================================================== --- stable/10/usr.sbin/iscsid/keys.c Thu Mar 6 11:13:26 2014 (r262844) +++ stable/10/usr.sbin/iscsid/keys.c Thu Mar 6 11:14:36 2014 (r262845) @@ -65,7 +65,7 @@ keys_load(struct keys *keys, const struc 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"); Modified: stable/10/usr.sbin/iscsid/login.c ============================================================================== --- stable/10/usr.sbin/iscsid/login.c Thu Mar 6 11:13:26 2014 (r262844) +++ stable/10/usr.sbin/iscsid/login.c Thu Mar 6 11:14:36 2014 (r262845) @@ -189,10 +189,6 @@ login_receive(struct connection *conn, b fail(conn, errorstr); log_errx(1, "target returned error: %s", errorstr); } -#if 0 - if (response->pdu_data_len == 0) - log_errx(1, "received Login PDU with empty data segment"); -#endif if (initial == false && ntohl(bhslr->bhslr_statsn) != conn->conn_statsn + 1) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403061114.s26BEa3G051564>