From nobody Tue Apr 05 23:02:30 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3F0071A9414B; Tue, 5 Apr 2022 23:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KY37q1L4tz3MQb; Tue, 5 Apr 2022 23:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhkYcrRevlsQUm06IXFnxPhgnYL58GK81IDR0eo4zXQ=; b=xPl0Hh/VySJJSzliA0IFssB88AqtHU4yQj8SEWZ3Al3S+qag7S9dTPMA9nGFNSHuWtjc4t KISEXd91zGnlL8TSU8tT1CoBvfOonTZP+Z/a4k1+JMZfnhAR/7XGrrH7aj2GSZ9/odSI0H ndl2v26vu1YNk8Y4daAY8Z25fB98pjrySeCnnQQgcO0YzMOE9H4z4k/NSMRwrNps6Vwikv NSJMar2mb65kAtyNC0XOjjJ7u0yb7Xxcgt4/Qz5Ho2KoMFUcGQoMAcLV0AGzb7Tibc7qvt aZrO4uCkzkwYp0IhClTkzpkxTIocgSqxhKJPNuOupVO/Xo3CPwqIzAN+q6B0Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DE017862; Tue, 5 Apr 2022 23:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 235N2U7t010388; Tue, 5 Apr 2022 23:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235N2U1o010387; Tue, 5 Apr 2022 23:02:30 GMT (envelope-from git) Date: Tue, 5 Apr 2022 23:02:30 GMT Message-Id: <202204052302.235N2U1o010387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 629df7c108ab - stable/12 - bhyve: validate e82545 checksum offset field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 629df7c108abe26496c3a5c196cce79a47bc1f21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhkYcrRevlsQUm06IXFnxPhgnYL58GK81IDR0eo4zXQ=; b=pbpr8QCGeZIfEvn55zd71DZhr1uqR3twBgWJUvxqZOuIjhDEHuYGyv5eW8u5FBFkbdx5eJ NrGBxkSIKX3g2KbCCw/g6qs/8TH9JhZm3ufHwDSW6CfRzHwezlP6GFfyPMBOmp31ztSPHp b/3vKT+Y41T7/Ct/hyLIJwqYz3G/g/Tjqu1pxVjskc0YwWKghbTO3x8cNVuod6hpgOZ5K8 8PN4Q8C6sFu03lT4ziDn8rCNdDJsh8zxtkPJbbVOAuC4D1edU4kodR7TIBVPaPkQ2L0NEG 1Zk9w0FhQO+UMTISRr4bcDZABD03fwXgLB5kTrJzHslARi8GGBs6N3xoh+/FBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649199751; a=rsa-sha256; cv=none; b=Qv+BRbBrQ15yD3YlGh5qFasWTJyvhuJnwwVhfD9NgOC69lBlmU8bBX5D39dz922jPJyoyk KddlSd26xMN0hDY8wyqz+uxv2NlBMKhW21nM4xZZuo/4RVPRJXLnW8zG7i7U87W1KIwhYu SybAhSl+Yxcqh9bIWla8ZGUVm4Y2OhOiEc3QSKLQlGAhF7GKsiezRZ4B5Scopz6u5REDSs MnSqNjqYmfaNlnTmQmfdxDHZ2R4HHFc2DnS/I9FHuDWWtNqHzhDY9conL5y0IEp2NHrehM Ydzvjo5KSPQUcGopwE7cnF3UAcbyJRVoDDf2QUlnns6b+OCGnKZv2iwxvyjHGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=629df7c108abe26496c3a5c196cce79a47bc1f21 commit 629df7c108abe26496c3a5c196cce79a47bc1f21 Author: Mark Johnston AuthorDate: 2022-04-05 22:52:18 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:00:28 +0000 bhyve: validate e82545 checksum offset field Reported by: Mehdi Talbi, Synacktiv (cherry picked from commit b0aa20bec5db244980a0248e24dd6b8e1e68c4d0) (cherry picked from commit 53f72209479885dfa6a7e6ed68cbc82c68464f4b) --- usr.sbin/bhyve/pci_e82545.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index c6ca5882a535..2a1e54d89c59 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1275,9 +1275,7 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, goto done; } if (sc->esc_txctx.cmd_and_length & E1000_TXD_CMD_TCP) { - if (hdrlen < ckinfo[1].ck_start + 14 || - (ckinfo[1].ck_valid && - hdrlen < ckinfo[1].ck_off + 2)) { + if (hdrlen < ckinfo[1].ck_start + 14) { WPRINTF("TSO hdrlen too small for TCP fields " "(%d) -- dropped", hdrlen); goto done; @@ -1289,6 +1287,11 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, goto done; } } + if (ckinfo[1].ck_valid && hdrlen < ckinfo[1].ck_off + 2) { + WPRINTF("TSO hdrlen too small for TCP/UDP fields " + "(%d) -- dropped", hdrlen); + goto done; + } } /* Allocate, fill and prepend writable header vector. */