From nobody Tue Apr 05 22:59:52 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 CD3CD1A92921; Tue, 5 Apr 2022 22:59:52 +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 4KY34m5F5Kz3Kb0; Tue, 5 Apr 2022 22:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199592; 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=lnXaFhy+LLjYrBGYHpF8queSHIEkZmY8md83x99r7dk=; b=XRBoT3AXy5F+8NIaWCjsjMRqj9+B5894jvICG6cDNoN0Okl2zVRz6raatZP8Hq9+Gv69OA /g979ib7q3uV0sd1O0dyr3pEAZy48d+EcDjyhkSUPpaL8FgFI/ro91+CquEzSNbiFWK72P AG4Z3fqq+azlRMi729KeqNHhRa+YtNXXl6TARIqAAt7T6VY+y/WvbpxeNJIWpVST5fHG2D mJL0WdytvRzKxASq9/A90/S5ZFzUmTBS9AXaf3CYrEAMV/rkT6UP4fj0GIpt68EWYWTT44 yCOb5Ya846eb8KA92vAEx2jChUdQl/S5YPlig4VlWdzHaK9v3qPcBDjbaC3XnA== 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 93BFA7836; Tue, 5 Apr 2022 22:59:52 +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 235MxqgJ096607; Tue, 5 Apr 2022 22:59:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235MxqYp096606; Tue, 5 Apr 2022 22:59:52 GMT (envelope-from git) Date: Tue, 5 Apr 2022 22:59:52 GMT Message-Id: <202204052259.235MxqYp096606@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: 53f722094798 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 53f72209479885dfa6a7e6ed68cbc82c68464f4b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649199592; 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=lnXaFhy+LLjYrBGYHpF8queSHIEkZmY8md83x99r7dk=; b=dJhFvpLaSqdMJCUEdodTbUWsFyTJCIW3YOJJoTFanqttZInjxFJMcxNfPQs+lGFVRecazQ 0hX8/z8J9aWMG/CH3bGd0P10eVJLjmLyL4GGzzKA66d59LBTRxENopROOtmpxYpczoV9px H0Uye7ozifshlRtkaRHEsuDsg2mC40iDVMYhybhL1MHUThss4WTCA/i9GHh5z6cnOk33vY iCEGk10XaZk134AXfB1I4gxcQ4MSmugDMfPQcuZzkHhbYViX1AibLBhM9FyQ8bHm4TRriZ gWnzogwcADikRa6ZVut8lM3M4DAkE+vTtVsdk5lgkC2k41cIj2hstf2WiSm8BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649199592; a=rsa-sha256; cv=none; b=sf/f/zC/WV4tUS9W5itknTUpqn/wcmKH+2lrT2USyMeF91Tju0Lw3qBb7cJyBOC1Ze7pwb QansAXYhjfOMs6ahnpYbqXbGLy4r/tEBP+5A92cSsLW56NRWN6zMxW7oB5NDWnr/+T09db Ty7uXqbxA0PWOxF0VW86gW1cIUpSQDqBVYSvFS90K4KFFe7q+79mo23umZKm34jlKri7VL VFvNARHzg8oWZlTrPnm1gDlEfTXNCUQavs67maKlpwq1IV3YGcc7F28eO5Giat2l7AjVeG 6SE7igZVTpyGLD9uRQXyYPNQ6WMbaRRzAqd7fIgawvOQw+WS72p3znmF9/HVyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=53f72209479885dfa6a7e6ed68cbc82c68464f4b commit 53f72209479885dfa6a7e6ed68cbc82c68464f4b Author: Mark Johnston AuthorDate: 2022-04-05 22:51:19 +0000 Commit: Ed Maste CommitDate: 2022-04-05 22:59:08 +0000 bhyve: validate e82545 checksum offset field Reported by: Mehdi Talbi, Synacktiv (cherry picked from commit b0aa20bec5db244980a0248e24dd6b8e1e68c4d0) --- 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 d0b4fb9e466f..76f2839fba31 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -1278,9 +1278,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; @@ -1292,6 +1290,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. */