From nobody Mon Dec 15 14:14:06 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 4dVMW26M0tz6KmWJ for ; Mon, 15 Dec 2025 14:14:06 +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 4dVMW23zvnz3LJl for ; Mon, 15 Dec 2025 14:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808046; 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=Gk7w6OkZLchFvLxXRyX7BIgmFa8Tp5BHDT54uqDEgyw=; b=N5iiDa4dOhWWJJar3Ct6Yiv0sFXwupyu1bzzlXgbL9X5cyvw6EBEYAy+b14iZ0Q8e7S6+k 4okeZBZ4Xm2+nC9jHn+OhsLqTRJhpq0+7WzGTesr96aLnB2NhMpiJzzkzodLoJcLIIf+sW cXoReR+U5hCbAMWpSZFpI4g3NUeZdbAl8pagfvsytumilV3cn6r666/5ug+YAxeSNDAeW6 pypP8zmwc+M0Wb2bXmQIU5vB+I/O7iOfMPQkCpETnkodJFwxQG5c6fEUxi0C9+hes8YOga 5WKU5+hfF+YxfXt+LecGKuhRMkBs/6OtDAI1NJ15Nv5eUtLWK5vh6DNP9Ezwbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808046; 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=Gk7w6OkZLchFvLxXRyX7BIgmFa8Tp5BHDT54uqDEgyw=; b=ElFoUldbXUY4SKtFWKhPc/qwscgHY1mIwXQkwuJUJuQFrhYD0R7KtEo7JxRdiW7Pg/bBxx nrSvqYB2uhlMnnDjKp9LXvROBt+i3J5LOIcu2wnwM/di9ntlLKUnBPLQcca+TXMBbLdO8a bd0A7UuEea5x56nd1OqqLRa59yAqf4R5ozJGAIUDznv2gsLm/fab4W1Q+ZW8p/9m3f7RTL KWCmNas94AmBOj0XDTzvS97nMqZlzTk9+E1fRSPUSthwyk3ABfunsnFXAbJTeu67eTvCC8 ZmL6oc1yivP6h1P2tU+Lb7mDqyx5y3IXTYU4Ye1OLG+Zhskz/y9Z2yOzk3Kceg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808046; a=rsa-sha256; cv=none; b=vMQaUo2jAZ9/+rgTRaRR9cg6W+VURXVg6mlyCXmlO5yL27qqEPktcX1Zd+b3NBkqUhMdpp jfud9urcBF4MQK2t7ADaNhdlvVp1dYwogyr1bEI0/Mo0yAi+XkM8Ko/1c2Jh2euZkWTGWh iir9bzh3RYxF5PenEODpuNdobl/b4jNgdcYbNMIDwf9xy4ykXr/IhC20h6wg0fzFB175rn skEYe16kJ/mWi1WudoXH8KumHBFJm+issrfj/NBk3erUV1CErLIhGWh4nRnnyG28SXETd+ uMXEcP0X1lCEJkhNQGU/OBRbuTZpjLVF/UeGkayPAN77k3cRf4Z+C966KzVzAQ== 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 4dVMW23Xjgz7lk for ; Mon, 15 Dec 2025 14:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35728 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:14:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2dd40f6cc09d - stable/14 - rtsold: Fix a buffer leak if we fail to read the default router sysctl 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2dd40f6cc09d74d59a4f04180d9174403f4f3fa3 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:14:06 +0000 Message-Id: <694017ae.35728.30f5439a@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd40f6cc09d74d59a4f04180d9174403f4f3fa3 commit 2dd40f6cc09d74d59a4f04180d9174403f4f3fa3 Author: Mark Johnston AuthorDate: 2025-12-04 15:00:46 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:12:39 +0000 rtsold: Fix a buffer leak if we fail to read the default router sysctl MFC after: 1 week Reported by: Kevin Day (cherry picked from commit 792221630bf4e58fcd923547bab689f4497613d8) --- usr.sbin/rtsold/cap_sendmsg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/rtsold/cap_sendmsg.c b/usr.sbin/rtsold/cap_sendmsg.c index 6e7f156fbe62..36c68b7ba78d 100644 --- a/usr.sbin/rtsold/cap_sendmsg.c +++ b/usr.sbin/rtsold/cap_sendmsg.c @@ -151,8 +151,10 @@ probe_defrouters(uint32_t ifindex, uint32_t linkid) buf = malloc(len); if (buf == NULL) return (-1); - if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) < 0) + if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) < 0) { + free(buf); return (-1); + } ep = (struct in6_defrouter *)(void *)(buf + len); for (p = (struct in6_defrouter *)(void *)buf; p < ep; p++) { if (ifindex != p->if_index)