From nobody Tue Apr 29 20:29:37 2025 X-Original-To: dev-commits-src-main@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 4ZnBkT4yD3z5vVgb; Tue, 29 Apr 2025 20:29:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnBkT3H90z443b; Tue, 29 Apr 2025 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745958577; 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=wKhJ7/snp/YazPv6nKpyfei5daBUnG6Et0dvvlmab9Y=; b=xj7AHCqJ7Ek5Qg9hPKmF2U5ha0VPke8162PS9g4vZyqhw7GNbUdJJL6zQBvR9FFKfg9oW+ xszdQKcRsvAex0EGY651/Q6AR9km6zml+bqYWIVXkqGG/YHdKfa4y3ODmOeO1Jmofl3hvU wcxOPJTiFgsRQtO1V12TegVbloZbeAIEBCHLMx2OlJ4bFkDyp2FcvDcrl66xlBDPgTOEDc e4rub39kVfq9bBomZ5gfqAWYnYHv5mhFzqX3w28axIp6wtG9D+BJo2azCAbOLC8iuko7Re E9RF+J1wXS89PU6dZGst+Z6zoSWpjxfW+04Npepi2OuPxknkRujv4wOrVyKSng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745958577; a=rsa-sha256; cv=none; b=rfDk8r2qGtTm2CZvdnk4KZ7AlrCkPbMJblxQsCqqXG4C4MtAELDJ9hvtTriiw0JvIGSuZB U5Du0+jPM4wf9L6greC17PH2Wj8f9l7u1GFKlC72FiHjcaD1pChGcGcpyg+QPbpkDf+wEv nbf30e2lZZUR0lqbPgRlo4mDaMcRxr6ymHxsinId/A6uxTcb3yaetU6uPbL9uydcmUksDN YDm3p51KaayaSzXcq4cw1vhoGSpPxIEKm7ZC4pUpLdVZKYseJyMNEODVL4ofLj9lQjWAFL 0sXrxyQ9r9r2nCP2jAwSXVFsj9b2gdu+0kbaerbffFeenPqhIAQALDNctlP3Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745958577; 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=wKhJ7/snp/YazPv6nKpyfei5daBUnG6Et0dvvlmab9Y=; b=vKrMwIHv2qQ8JPGZRfTq5jvUspbKsMPmULYE1Tq/szX5QIBI3eUM5jvCOCudXWG804auCN ZKHr37bpGSSWpCPPDYUJpqC9sJpt+zXQDmfMZKszAkOH3SRwcvu8tWeIrWG9mYH4UUSRqL 5REc5GQgOPank5NV4gKC+ObJ0JJrYn298GJfvD4Tr+DcBikZgnIiammv9SyKEuqUSm9Rro O1RetEMzClOhYEOMoVV8AdEA53fAzCGK0tzn563UKZO7F4NtCUF/NSxAStnAWahrGEvx+W FNrA7e3wDGTuHrXiiNcb0Hv1dHrvpQN0TPm31ySnTKJUAFF1LwBzj16mCIzWMQ== 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 4ZnBkT2pW6zbqV; Tue, 29 Apr 2025 20:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TKTbEJ039920; Tue, 29 Apr 2025 20:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TKTbbj039917; Tue, 29 Apr 2025 20:29:37 GMT (envelope-from git) Date: Tue, 29 Apr 2025 20:29:37 GMT Message-Id: <202504292029.53TKTbbj039917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: a4fcbac5d891 - main - rtlbtfw(8): Fix incorrect chunk index overwrap in rtlbt_load_fwfile() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4fcbac5d891e3909474ffe7ed7064972a1a7577 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a4fcbac5d891e3909474ffe7ed7064972a1a7577 commit a4fcbac5d891e3909474ffe7ed7064972a1a7577 Author: Vladimir Kondratyev AuthorDate: 2025-04-29 20:28:53 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-04-29 20:28:53 +0000 rtlbtfw(8): Fix incorrect chunk index overwrap in rtlbt_load_fwfile() It prevented large (>256 chunks) firmwares from loading. Fixes: 5036d9652a57 ("rtlbtfw: Firmware loader for Realtek 87XX/88XX") Sponsored by: Future Crew, LLC MFC after: 1 week --- usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c b/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c index 493358294c07..21f2c3e2804f 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbt_hw.c @@ -189,19 +189,18 @@ rtlbt_load_fwfile(struct libusb_device_handle *hdl, uint8_t *data = fw->buf; int frag_num = fw->len / RTLBT_MAX_CMD_DATA_LEN + 1; int frag_len = RTLBT_MAX_CMD_DATA_LEN; - int i; + int i, j; int ret, transferred; - for (i = 0; i < frag_num; i++) { + for (i = 0, j = 0; i < frag_num; i++, j++) { rtlbt_debug("download fw (%d/%d)", i + 1, frag_num); memset(cmd_buf, 0, sizeof(cmd_buf)); cmd->opcode = htole16(0xfc20); - if (i > 0x7f) - dl_cmd->index = (i & 0x7f) + 1; - else - dl_cmd->index = i; + if (j > 0x7f) + j = 1; + dl_cmd->index = j; if (i == (frag_num - 1)) { dl_cmd->index |= 0x80; /* data end */