From nobody Mon Dec 15 18:18:27 2025 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 4dVSx00BHqz6L7LG for ; Mon, 15 Dec 2025 18:18:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVSwz31t0z4KvR for ; Mon, 15 Dec 2025 18:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8I84J8gVdd9em7V2iHXdPErKqJT74qnFXWobWmq+MkQ=; b=i6TZyHo08LZRpF6P4VhnH/EWAdBH45WTJIRnvbwBe9b+xhWXSFONAxhz6lWAZbN6NJcHtq hvofYCfqAJlrZLClLeTBT56HpWYUXL/A9k1lcxp4qs8HtsQhEaJYY3PPLHS/pyBTV/M4tn vP4JqJ1spIg5aqU54hUIn521bG0okBTTqx8yQN/Je1x/G9CQYdRvt7ZWH/oaShyU3dY+qc gMFvney6sbqQIU86znAO1oi5rJcjafHSeKOd3rCC8eI0SEafacK1B7wTtqBxbnhqRgyfDG N7cW/cxPnpqSyJgr6zamID12wslBKVybN1TAGnT411npzmVKGNAuIZi+iqL1nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8I84J8gVdd9em7V2iHXdPErKqJT74qnFXWobWmq+MkQ=; b=nfqafn2qfRs3nOAf4uOYFQA/T0NtQ/WQ1nYb482ZshVq4vXmoI18vYfjhGkXJ8sDBBDHBP kzXu8x5Fx2N4W7jOH0mkgOQM3viXvpu2UpXiA3GtARROrovLHE4vW/vBPwAKWWvkFIBgI4 YRlxcrGidalV1SlEMtxHOOEtfJ3HIl1to9rC0tjnTvoBKSKopbOqUBiEz2lqbvHsqI4o7V ejmdVzl48RIHlz9gjBkQmxAVJvpKI3TRylSHLtGbATdq4ikZSAJJ4Ip8EHgOOPkdyrcnYW 39UuZM6EAkk/+yJkZ5bQkiUMz0dNtIVSyA1eiWrH1ubu5Uz+yHIhOgU55sqnxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822707; a=rsa-sha256; cv=none; b=Xf4MVx33Ytuk8kL11Wo9M4JKKWISovQbd+suuAJJYViyhTxbepB/wJTGSaMmR0VY3A6NCG jXezkxmCC8COWmrp9TqPRyPPWFYom3ethMzrQkTzgFifYN4CLgMeCdmVv76dPbr5iN/Bwd ZuzLr5/IXXdbODOqeBE+6LLGGSWUIj14Zcg3W0d8YtIfvY5af5JujbTbez1t/0S1uoQxbB JD9bdX1ItBxEsAWRS4OpkeFCBf8bmLSXbMyW8k/0WLFJuUSSS/M2kk6wg9+7YOJCegas9e 1Ui/48nOOf2qqO1L91icxaiaFm91mj6+JRiZxUILuc2fZcX30sQ9d9PARRYpXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSwz2QdFzWbF for ; Mon, 15 Dec 2025 18:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dapeng Gao From: Jessica Clarke Subject: git: e41762d412d7 - stable/13 - Fix off-by-one bug in btpand 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e41762d412d7d06a85db031de100cd0b2a5c0c02 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:27 +0000 Message-Id: <694050f3.25529.6e9489e1@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e41762d412d7d06a85db031de100cd0b2a5c0c02 commit e41762d412d7d06a85db031de100cd0b2a5c0c02 Author: Dapeng Gao AuthorDate: 2024-06-03 19:30:36 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:35 +0000 Fix off-by-one bug in btpand `ul` reaches `__arraycount(services)` before the bound-check happens, causing undefined behaviour. Reviewed by: imp, jrtc27 Fixes: 7718ced0ea98 ("Add btpand(8) daemon from NetBSD.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45463 (cherry picked from commit fbfdf57d65bedfab28f9debc8a4a8d6802f9338a) --- usr.sbin/bluetooth/btpand/btpand.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c index a0f380918bf1..721bafba8321 100644 --- a/usr.sbin/bluetooth/btpand/btpand.c +++ b/usr.sbin/bluetooth/btpand/btpand.c @@ -147,11 +147,14 @@ main(int argc, char *argv[]) case 's': /* service */ case 'S': /* service (no SDP) */ - for (ul = 0; strcasecmp(optarg, services[ul].name); ul++) { - if (ul == __arraycount(services)) - errx(EXIT_FAILURE, "%s: unknown service", optarg); + for (ul = 0; ul < __arraycount(services); ul++) { + if (strcasecmp(optarg, services[ul].name) == 0) + break; } + if (ul == __arraycount(services)) + errx(EXIT_FAILURE, "%s: unknown service", optarg); + if (ch == 's') service_name = services[ul].name;