From owner-svn-src-stable@FreeBSD.ORG Thu Mar 6 11:14:37 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27DCD9C4; Thu, 6 Mar 2014 11:14:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EDC7829B; Thu, 6 Mar 2014 11:14:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26BEa97051568; Thu, 6 Mar 2014 11:14:36 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26BEa3G051564; Thu, 6 Mar 2014 11:14:36 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201403061114.s26BEa3G051564@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 6 Mar 2014 11:14:36 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 11:14:37 -0000 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) { /*