From nobody Sat Apr 30 09:23:36 2022 X-Original-To: dev-commits-src-all@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 956E4199F6A2; Sat, 30 Apr 2022 09:23:36 +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 4Kr3nN3h3kz4pTd; Sat, 30 Apr 2022 09:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651310616; 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=3nWF7zUQxwpGeQSkBTIvTmx3aOKR6y4EycFWTNFVj50=; b=hhCkOn7SMcxLqgLQ0Wz0JrNP/wvIQqHeIfLOQpEjr+fDS0OdPv//Ppcp8L2kEBK23hDCbr JhQms1hqQTk4oOg5cPDSTInzJTbyiraHBIsa2GVU2sPEF4reaKpsp/CTdP1TnM8s7sdnh5 u9e2KV2u7NmMJoGLNFyokUWKo5209vQ2fRRTUOzyd3Ru7OSi+dZpX/zbQOMJ7+A/pMIZ/y zRm7MJCDEo1OaYZmEiOe8hh20FDiDpKJvGLuc7bPHjpNbXexN9zxUH10bof5cCPxH5cUKu igHDTRMm+Ctw2p6WccWmbXNStW2h8USCnZJn15t/uLa/+TxDOzDH4R9lR/fdNQ== 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 5EB151EBCD; Sat, 30 Apr 2022 09:23:36 +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 23U9NaqK067708; Sat, 30 Apr 2022 09:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23U9NaWT067707; Sat, 30 Apr 2022 09:23:36 GMT (envelope-from git) Date: Sat, 30 Apr 2022 09:23:36 GMT Message-Id: <202204300923.23U9NaWT067707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 6eb6aeef7e67 - main - uath(4): Fix incorrect byte-swapping and a buffer length check. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6eb6aeef7e670bddc9cd52aaf32765a9ea85eee3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651310616; 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=3nWF7zUQxwpGeQSkBTIvTmx3aOKR6y4EycFWTNFVj50=; b=SgFPfEGmiQRISdy/6Sl/N69OQp7Wg/JLCnjLzeYwSBmSlX4K7o1UnJjyDYzwyDi3F5vwEY fb1jWpsOA0G4J36hvHSibiThehH0zEepWg67LsQWMCuFw86OCm47QJWmzt47RN8DcjhlO6 RQQpvwesrhnQJ+gdn5qzKVJ6VUcSU7PC/pEyyBsupX1+MPljP8GDzSWFbeEVaSp2EVvuIk 6R6k7x/erFGtxmWlEwio6ETA1tmb0wNwGQx3ikxVE8bMvjy5pz0t/G6L09sMdcEB50GQ8b gYmko7VqzKzFHmxeJPVFmiYRct99rqJxi8iaxn8mg03TWYSSseOLviVMGdUuHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651310616; a=rsa-sha256; cv=none; b=qETfKWL9WEapcpN6NkKjIzK8ORgs0j8brt07R3SQpdWXUFR6OGDk+8HPrLtMAKxHhXN5/V pUAWvn5sY7Yubgly2J58BCTLAJkPX+y7rju4+v/EC70xawBCcnGfpWx+Up/LoteB73DknG dOtrdS16FfcS4O3GVPJOeupCIdl2p7b5G/2g2PRvLRYchQA6Qy8l4+r19Hdz9KWZl4bq16 xU4WGuWArwNJ/ORrfsvxMs8vtfZo82OoVJA8K6buMe616cL3CXkNXllzEMkRMbTxnaYrei jSPFErJBC4AFjumJI5EuIxvc6HA8uqauaLvrVFEBIu0CmocuBN+JX7gAu7AzoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=6eb6aeef7e670bddc9cd52aaf32765a9ea85eee3 commit 6eb6aeef7e670bddc9cd52aaf32765a9ea85eee3 Author: Hans Petter Selasky AuthorDate: 2022-04-30 09:21:54 +0000 Commit: Hans Petter Selasky CommitDate: 2022-04-30 09:23:07 +0000 uath(4): Fix incorrect byte-swapping and a buffer length check. PR: 263638 Reported by: Jeff Gibbons MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/usb/wlan/if_uath.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index df7e1d7c396f..4ffdc9a72fad 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -2244,7 +2244,7 @@ uath_cmdeof(struct uath_softc *sc, struct uath_cmd *cmd) u_int olen; if (sizeof(*hdr) > hdr->len || - hdr->len >= UATH_MAX_CMDSZ) { + hdr->len > UATH_MAX_CMDSZ) { device_printf(sc->sc_dev, "%s: invalid WDC msg length %u; " "msg ignored\n", __func__, hdr->len); @@ -2360,11 +2360,10 @@ uath_intr_rx_callback(struct usb_xfer *xfer, usb_error_t error) usbd_copy_out(pc, 0, cmd->buf, actlen); hdr = (struct uath_cmd_hdr *)cmd->buf; - hdr->len = be32toh(hdr->len); - if (hdr->len > (uint32_t)actlen) { + if (be32toh(hdr->len) > (uint32_t)actlen) { device_printf(sc->sc_dev, "%s: truncated xfer (len %u, actlen %d)\n", - __func__, hdr->len, actlen); + __func__, be32toh(hdr->len), actlen); goto setup; }