Date: Thu, 25 Sep 2014 09:12:12 +0000 (UTC) From: Alexander Motin <mav@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: r272101 - stable/10/sys/cam/ctl Message-ID: <201409250912.s8P9CCKm048797@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Sep 25 09:12:11 2014 New Revision: 272101 URL: http://svnweb.freebsd.org/changeset/base/272101 Log: MFC r271957: Fix read overrun handling, broken by using wrong variable. Approved by: re (marius) Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Thu Sep 25 09:11:01 2014 (r272100) +++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Thu Sep 25 09:12:11 2014 (r272101) @@ -2509,10 +2509,10 @@ cfiscsi_datamove_in(union ctl_io *io) sg_addr += len; sg_len -= len; - KASSERT(buffer_offset + request->ip_data_len <= expected_len, + KASSERT(buffer_offset + response->ip_data_len <= expected_len, ("buffer_offset %zd + ip_data_len %zd > expected_len %zd", - buffer_offset, request->ip_data_len, expected_len)); - if (buffer_offset + request->ip_data_len == expected_len) { + buffer_offset, response->ip_data_len, expected_len)); + if (buffer_offset + response->ip_data_len == expected_len) { /* * Already have the amount of data the initiator wanted. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409250912.s8P9CCKm048797>