From nobody Fri Apr 24 15:15:52 2026 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 4g2GkJ3gmcz6bRW3 for ; Fri, 24 Apr 2026 15:15: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2GkJ32fvz3BmX for ; Fri, 24 Apr 2026 15:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777043752; 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=+h4HlcJTbOMYbGuIpTcNMNA8U5/XAoEZtOP6m07p9q8=; b=cjKy0YSHmt3ZpblE22ZP+HKXkl1/50zd5kMBaQzs8R6iWDxuYRn25VLNbxEiRdheGo4mUh rpnodNo2gDbKWsnl9Qz4I824ODQ8R1rboWP7yaamSQWm5p7sqfzw7TIq9TlSksGSMbNTIX TuZzerOxrs6Tv2gL6nPKogQTnDcAR93DxXP7rABqwJxcV146tWphkPOX2ykEuy8BEs13BZ 9qmoFSYDL5/OzZofXoud0kGoTiBBI6+Qu3fLZKhZjFpu1uKtak/z/UWC6OdqjCs7ekU+Sf nDU9RQdFUWVAXuwmzTHDB0ITrvjEN1tf9sujiSy4Vb+oMw5DxvvUizOLTZeGpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777043752; a=rsa-sha256; cv=none; b=nDKNYXNDf8BIDB1tReuQMoQyPpr1NKbXyx52JHgWUQO5hObvG6KijTkbGD7EETdyAwrgXo dlYhpJQ2LisclDy9bBoWBLiOjatwdPdSnwOCvHy9AsuzHd+diPyuGUnhqkgXxa93Bub9fS ZB/Dvqg3lwTKIzwuLojyddLGHKiOl3UXu/fzYPjeShNNz6Ss3HRZs10MbElwURwmhth4WE 7dWFMHbVYCyrIz8Dva79iAd2Gt28cVgz19lgJD74Zzu91GoyYeDBrOeZz51auXi1fp4jLs DIqhQTkGT5HNuje3KifrWkyLvfWH+P3gF48OmgZB9+FIcKDUnGCwL4MdzWqcnw== 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=1777043752; 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=+h4HlcJTbOMYbGuIpTcNMNA8U5/XAoEZtOP6m07p9q8=; b=cdqwjxAUGuhGL7JGT1qY9lxz36FVlmAsXx7JXxSk9bsd0ChkivqkoqN8fc75neCMkE3OIh 5MbYDvUojgMPhuklBSggQy1MGTDM5ISPdIXiRFcgXw28PalhZZdCnUIj5bQ1GUoq9t8XFs pTc4/jnUbWcHj4Py3VXvvAs+DL6VGxoJCoFVr8gqaq0RluUgO4DQujBxlVvvCYZQ2gvqpd PPECrY6dA7Qp+WGvH7QDZfFR/aQejJ2ImyVBxGn2GG9/R8sid8GlYnd87vxmg1WWoTioA+ eZ9ubIxcxqS11LlJByqdPPGQhxUv+/kmYUObRgoM+x1My0hgDe6Ja0avfDMUoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2GkJ2Qw7z17QK for ; Fri, 24 Apr 2026 15:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32bd4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 15:15:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 87ed6840a0a6 - main - rtlbtfw(8): Load firmware from filesystem with mmap() 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: 87ed6840a0a6320295f6abb43a987d20ae126cf7 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 15:15:52 +0000 Message-Id: <69eb8928.32bd4.7043e25@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=87ed6840a0a6320295f6abb43a987d20ae126cf7 commit 87ed6840a0a6320295f6abb43a987d20ae126cf7 Author: Vladimir Kondratyev AuthorDate: 2026-04-24 15:15:22 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-24 15:15:22 +0000 rtlbtfw(8): Load firmware from filesystem with mmap() rather than with read() to alleviate concerns about partial reads. --- usr.sbin/bluetooth/rtlbtfw/rtlbt_fw.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbt_fw.c b/usr.sbin/bluetooth/rtlbtfw/rtlbt_fw.c index d7e9f2f939c6..aadd254571bb 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbt_fw.c +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbt_fw.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -166,8 +167,7 @@ rtlbt_fw_read(struct rtlbt_firmware *fw, const char *fwname) { int fd; struct stat sb; - unsigned char *buf; - ssize_t r; + unsigned char *buf, *mmap_addr; fd = open(fwname, O_RDONLY); if (fd < 0) { @@ -188,23 +188,16 @@ rtlbt_fw_read(struct rtlbt_firmware *fw, const char *fwname) return (0); } - /* XXX handle partial reads */ - r = read(fd, buf, sb.st_size); - if (r < 0) { - warn("%s: read", __func__); + mmap_addr = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (mmap_addr == MAP_FAILED) { + warn("%s: mmap: %s", __func__, fwname); free(buf); close(fd); return (0); } - if (r != sb.st_size) { - rtlbt_err("read len %d != file size %d", - (int) r, - (int) sb.st_size); - free(buf); - close(fd); - return (0); - } + memcpy(buf, mmap_addr, sb.st_size); + munmap(mmap_addr, sb.st_size); /* We have everything, so! */