From nobody Sun Apr 30 06:57:47 2023 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 4Q8HGh0wYqz48rlB; Sun, 30 Apr 2023 06:57:48 +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 4Q8HGg6dP0z3MZX; Sun, 30 Apr 2023 06:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837868; 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=33rvQvzQHjE9BVKlTHQ4Qeubpw0DtvIvvWYfgQx8MKY=; b=UqAffrQc3mipCZt0SCbRtxobWvsrxiEbF61OUVlXWwv+cVVe4omRyulu+VyM0jgbm0Nhf8 3B65LAj+mCQZD28BEQ8ICC5Cg5pMdZ3G/IMMQgQIt1mEzvB1NFxVlypq7LVQU8o+q02awj eMcYc/jQP33flEtnOXhZqDHMBqRIRYbhIpoEjt38c0iTgSC4lqV4uMU+Cvh/y4kxVHCrK3 lDByhw2SRf7pJqLk913dyeMaSDvIBTRy1N3dTB1DZmEGZmZBJ3El6G0hVbKQJYRMnNFmZp pXez25DgZeYYMC7Ej2+07Qdvjj0v7ovXa8ays8utULgb67LicnMp4q7Ip1g4rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682837868; 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=33rvQvzQHjE9BVKlTHQ4Qeubpw0DtvIvvWYfgQx8MKY=; b=fjBQHLFsK9YDvcN1QxmJy0zblCqtQBn7GPPAvMRh/hLcp5KDDnUIVUBw6ItayBHEO8Hea1 SFm4sZDj3KhqwG5/ZyibEV/zi4uWT63vUW2eNt/D2F1/eACb/Sob2wCxrwnnBrVi3Z36YB 7bP0aa/quf2u1Jq5jygxEQtjlKXd6J5MO8n/B91MDSmF3LetBvZq/9tTR4JpF6vz8bFRtw +rdrs//si6bn/yP3nFTkWS4xRRbOCnLReX/nT75KcGEXbby1nLAzVLmnyGFPSzHl59Fwe1 hwY4gpcbNkmFx7sMe2drqUBQ0DBMZq0s6Z9cXzNIO/df7TQRljKnt6ieE1veww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682837868; a=rsa-sha256; cv=none; b=Br6G9yczAdDZ/wCV2yguCpkSD/hX+BLK0DWq5cYTZJTX7BSxlUqevd+uTPAXt1lg332hMj eFSveW8VMG5Y4MkmmT8Rk/MiFmlhOhgAHU7A4ergjMZ467oazasIJetP1SXWIANYATtaHG ZAIwTBVwZo3WxU+x9Q+MFGwtzTiDmFZnmeQX/xtPsQn9ZJh+/a5tbIQbt/1kj6UdFzYprJ +eoGaoBfY7CM1dmAvfe9ZnBOziVErUPaSY+SNIEP5WOa7hMPQlVorC8s3+pHR35oEuUEjr lsmJOdOqF0br2GYNCjAGfUqb/Lkoqwv/x57ZkAhNum09OFJWqs+STyBKZ7TRdA== 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 4Q8HGg5dTvzDhS; Sun, 30 Apr 2023 06:57:47 +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 33U6vl7E071425; Sun, 30 Apr 2023 06:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U6vlFS071424; Sun, 30 Apr 2023 06:57:47 GMT (envelope-from git) Date: Sun, 30 Apr 2023 06:57:47 GMT Message-Id: <202304300657.33U6vlFS071424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: e7f8a67e1f88 - stable/13 - uath(4): Fix incorrect byte-swapping and a buffer length check. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7f8a67e1f88442d8d66a0a1c3de03ba8fc13078 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f8a67e1f88442d8d66a0a1c3de03ba8fc13078 commit e7f8a67e1f88442d8d66a0a1c3de03ba8fc13078 Author: Hans Petter Selasky AuthorDate: 2022-04-30 09:21:54 +0000 Commit: Hans Petter Selasky CommitDate: 2023-04-30 06:56:16 +0000 uath(4): Fix incorrect byte-swapping and a buffer length check. PR: 263638 Reported by: Jeff Gibbons Sponsored by: NVIDIA Networking (cherry picked from commit 6eb6aeef7e670bddc9cd52aaf32765a9ea85eee3) --- 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; }