From nobody Mon Dec 8 14:12:00 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 4dQ3ny2JPjz6Js45 for ; Mon, 08 Dec 2025 14:12: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 4dQ3ns0fS7z3nTj for ; Mon, 08 Dec 2025 14:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203121; 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=k5ZNITD9Wf8LdyUQh42MaejFq+p5/5O+owk+dfuL7tU=; b=fxvcuimxXis9UU71Fb92iGo9QBnVbM/dby6f7zW3tLgkZjV5PVdU4n5UnTMWUgQYQFRO/9 AmXRSNn9XLlFyczhGDgR61LSC8W402ZqkPqgtHeEgXSfjfJ4C7Qzj9QbqGoU/Ww/XI7JcH fXMX4Gpy/CKyAyO9VWlFCWJOJ4jMO8e0/C/HazCdEjeBNK3ejXhN3CoUTi3KH0VioMPy7l 2YYUTkQz6vloRTpo3BBDk4WXdxdciUtP99G3cQKKjJZEJa3V4tQgmC4/Ajx1kSXqfGqFF8 VzxrTlK5u6oJAdFyRLZYU/NN/kq43GMqPCm1iGVdd0msFDqnofWrcuTBvU4gCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203121; 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=k5ZNITD9Wf8LdyUQh42MaejFq+p5/5O+owk+dfuL7tU=; b=EU0WFTp22F6nZlWAx90Cb88zHu+9UqMjPMzi2lpO9J+p0Sl2HwPnkMdT9J62txgO0a5sR5 Jou9heBOp8fEZfbEV/1nxVc/QBBVCkDFLBXxsT2xtZd5dVVIsrxqQb0CqfL71tJzlkZGWO ziG6/H+RG86JEftc0B9Q857S9cov96eTB0iF0PP6566AEmFm22g2PRCXrXm2usT5+YYHSn 4X4qx2Wp0T2dPq3HOwqRuoBQMnB51QIaB2/t9Oq74PY5YlEvjIwKEKHnXBsBccxgjqztYS C7HjKUC4EKSMVOj0veC4sv2w7czEPsvbivff8cgc4uVVd+kVeemUbD2lWRaeRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203121; a=rsa-sha256; cv=none; b=oEHZZiugUHVwg0Odi/B+KWNSOGv2FJN+iMT06D5kWrbTA+CHoJP+TY7CFdYNXRr3LtsBCI QzN1ltxXnBQC0zSuk3EsWi48bVoL7FBbcG+HEPDg7Nz67Wq1OsgtcQ+PP25sBm6VUGER9+ En7FuOhPv4kW4Psov1gGp/Z1c7WR7z7WK6KVxDEGDpNeXgogAxXi+NxZZFYTXuB1joBC3u eVftREzvI2/3rvRAxUqS7Fdn0zan8volMeWQlukMbcYoKlpmV409wY59FAZ9+AIDyyYRfX OJQZv0NnbeHbtwPYwGON02jYv2PoiGU/hxhIaBN6cpSKAgjrj4RzylWCjXn7ng== 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 4dQ3nr6vpJz1QR for ; Mon, 08 Dec 2025 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fe40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:12:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 792221630bf4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 792221630bf4e58fcd923547bab689f4497613d8 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:12:00 +0000 Message-Id: <6936dcb0.2fe40.4932bc03@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=792221630bf4e58fcd923547bab689f4497613d8 commit 792221630bf4e58fcd923547bab689f4497613d8 Author: Mark Johnston AuthorDate: 2025-12-04 15:00:46 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:08:13 +0000 rtsold: Fix a buffer leak if we fail to read the default router sysctl MFC after: 1 week Reported by: Kevin Day --- 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)