From owner-svn-src-all@freebsd.org Wed Jul 27 07:19:07 2016 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 A1959BA5AEB; Wed, 27 Jul 2016 07:19:07 +0000 (UTC) (envelope-from sephe@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 6E5CB1EB4; Wed, 27 Jul 2016 07:19:07 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6R7J6oa088646; Wed, 27 Jul 2016 07:19:06 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6R7J6Sc088645; Wed, 27 Jul 2016 07:19:06 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201607270719.u6R7J6Sc088645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Wed, 27 Jul 2016 07:19:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303369 - head/sys/dev/hyperv/vmbus 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.22 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: Wed, 27 Jul 2016 07:19:07 -0000 Author: sephe Date: Wed Jul 27 07:19:06 2016 New Revision: 303369 URL: https://svnweb.freebsd.org/changeset/base/303369 Log: hyperv/vmbus: Stringent RX bufring data length checks. MFC after: 1 week Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D7316 Modified: head/sys/dev/hyperv/vmbus/hv_ring_buffer.c Modified: head/sys/dev/hyperv/vmbus/hv_ring_buffer.c ============================================================================== --- head/sys/dev/hyperv/vmbus/hv_ring_buffer.c Wed Jul 27 06:52:43 2016 (r303368) +++ head/sys/dev/hyperv/vmbus/hv_ring_buffer.c Wed Jul 27 07:19:06 2016 (r303369) @@ -339,8 +339,12 @@ vmbus_rxbr_peek(struct vmbus_rxbr *rbr, mtx_lock_spin(&rbr->rxbr_lock); + /* + * The requested data and the 64bits channel packet + * offset should be there at least. + */ bytesAvailToRead = vmbus_rxbr_avail(rbr); - if (bytesAvailToRead < dlen) { + if (bytesAvailToRead < dlen + sizeof(uint64_t)) { mtx_unlock_spin(&rbr->rxbr_lock); return (EAGAIN); } @@ -366,7 +370,7 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, mtx_lock_spin(&rbr->rxbr_lock); bytes_avail_to_read = vmbus_rxbr_avail(rbr); - if (bytes_avail_to_read < dlen) { + if (bytes_avail_to_read < dlen + offset + sizeof(prev_indices)) { mtx_unlock_spin(&rbr->rxbr_lock); return (EAGAIN); }