From owner-svn-src-all@freebsd.org Mon Jan 23 17:44:35 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EAEECBEAAB; Mon, 23 Jan 2017 17:44:35 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2A0CB0; Mon, 23 Jan 2017 17:44:34 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0NHiXhS037149; Mon, 23 Jan 2017 17:44:33 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0NHiXU1037148; Mon, 23 Jan 2017 17:44:33 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201701231744.v0NHiXU1037148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 23 Jan 2017 17:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312669 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2017 17:44:35 -0000 Author: mav Date: Mon Jan 23 17:44:33 2017 New Revision: 312669 URL: https://svnweb.freebsd.org/changeset/base/312669 Log: Fix overrun handling issue in r312291. MFC after: 1 week Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Jan 23 16:40:20 2017 (r312668) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Jan 23 17:44:33 2017 (r312669) @@ -2638,7 +2638,7 @@ cfiscsi_datamove_out(union ctl_io *io) * Complete write underflow. Not a single byte to read. Return. */ expected_len = ntohl(bhssc->bhssc_expected_data_transfer_length); - if (io->scsiio.kern_rel_offset > expected_len) { + if (io->scsiio.kern_rel_offset >= expected_len) { io->scsiio.be_move_done(io); return; }