From nobody Wed Apr 06 03:04:14 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 2FABA1A84479; Wed, 6 Apr 2022 03:04:16 +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 4KY8Vl35qtz4dQj; Wed, 6 Apr 2022 03:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214255; 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=RNDenYQMabMvzM1aFSIfAG0wRHxVu18+z392bXXR0QI=; b=ufOthycF7Qm9Io9kJE4D8sT+VbBJohKVvtVKGs2kEQECt4jbuOgnHMIQkWhwKLQw3SedSy sngwwamC+6HOi5FxCe1aTAxQvvGqW4CE6Q+320ZwXcXxWmE9J/Z1UTsOAaBhfURFoHR9Ci YGW/TzC2HP9+IodI01Zfml3rNlrMGubo7koRnGepoHJnatMOO9UUogyoAnZqgNjkU4t+rl ZGQzUztlWNo6THGkDj/ItAXY/GgzKk4irrbDrANA34oOfzhcw6lz+JDVn9xEezqymkZl7Q F+d5C2gSErUN5al4lZlYxBu9v0f+dPsqupSvyzkhlZhpOFQYD2Xekg1Zj9fTiQ== 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 26E80133B6; Wed, 6 Apr 2022 03:04:15 +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 23634Ex9034760; Wed, 6 Apr 2022 03:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23634EEx034759; Wed, 6 Apr 2022 03:04:14 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:04:14 GMT Message-Id: <202204060304.23634EEx034759@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: b85c68857da3 - releng/13.0 - 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/releng/13.0 X-Git-Reftype: branch X-Git-Commit: b85c68857da3fdd833c4c146e2f5f49f4c16b0d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214255; 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=RNDenYQMabMvzM1aFSIfAG0wRHxVu18+z392bXXR0QI=; b=vkfUZ0iCn8Y/cBBEGJoRLcxSP4ghkuA0v6YmlCEg4lVETg5tMd9gIXaAoSgIxhfjb/nIAR c6t6SafQzVmp9dAkQwRwSeRZv7EPmNTjNojWyWNrk1goJKMLC5bjb+BjEHKMWUIm/Ku4Ps qtWxiIGlbXdHiJqxoBU7oNEC1rDlSY0i6i+AmE59hFwC4krqYPv8V0gVmKnWCR6ZSVIZAB mxlIw+yEys/2C9orX7DXtt+bm1aaWfctCdGf+dGCbX35IFu0X/RQ0XIpoAiJBrZS1Swn2n hXevthMfSuvhelTzWj4475TyPU4fOIf5BVs4uL6nlbVndH5a6uoPDD6STVHntA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649214255; a=rsa-sha256; cv=none; b=tqccfnZriYpayimr0aqYpupeQW7nE77444Pitlg3zhgyTL/1E3UDEjwOZwRWC8d1VW8PgP fgiYwAm9QLoQmHH51LtOAYEE+QZVhfXO9HhBkLKqC77Tc34LOv8rMjZxsikS158D8W+f58 2g+8/j5kVjP2gqgsDL6DfyIkfDEYQwaFDkFG9bvMokq2uFVlfIZZfhx6NurkUOErbvyTO+ Y/yoITNpE+LB1n9AwgC1WUIQP3DoNWFfCRylUwCnVMpFpuUwpZbOO+xXWouzT3c+HcWH9u e6tUzavCobKRsHIO3FIlfck0NQVn8AaA4taSLVgRqgSDsF5BCvV7DZV3UkoNYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b85c68857da3fdd833c4c146e2f5f49f4c16b0d7 commit b85c68857da3fdd833c4c146e2f5f49f4c16b0d7 Author: Mark Johnston AuthorDate: 2022-04-05 23:26:02 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:26:02 +0000 bhyve: validate e82545 checksum offset field Reported by: Mehdi Talbi, Synacktiv (cherry picked from commit b0aa20bec5db244980a0248e24dd6b8e1e68c4d0) (cherry picked from commit 53f72209479885dfa6a7e6ed68cbc82c68464f4b) Approved by: so Security: CVE-2022-23087 Security: FreeBSD-SA-22:05.bhyve --- 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 2d09c024f258..9581e616c76c 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1277,9 +1277,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; @@ -1291,6 +1289,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. */