From nobody Mon Dec 15 14:16:18 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 4dVMYZ3ghcz6Kmps for ; Mon, 15 Dec 2025 14:16:18 +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 4dVMYZ1lmkz3MKV for ; Mon, 15 Dec 2025 14:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808178; 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=PINrA07mZ7vf9+G9ZmPAW2eTSt09RBl42vjxdAsWwKI=; b=N+CZqz3d7FDjB92LoKJCdp9RHW5zA8IzDJT8Woqb5tkCwZqiNwEGDgxlUPILtzN7KOsgIW +C/HZQ6n4aF4+Q3V+E4ab4Fanr2cypPzkfri1+H6B0sQanR38GwlXbgSxUjFky5VnVfIO2 yHveGWjP4Ys300Kq2w7xnKYZ1PPkPMyn+SzuivDgIHEV8L785Xiv6sVe18KcseESKPwKqJ IJpxr9uhsSO3ANPibOyneVjsYWiPqYRnHhX/hu7newbfjaxGZjxUMBpiu/PTKB1DUYIEL7 sAZq4bdVM6kYUzfjo2JbTHPZjjnaHnaZ+LDp/FGWdOlsGube/4E/+Muz98Mseg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808178; 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=PINrA07mZ7vf9+G9ZmPAW2eTSt09RBl42vjxdAsWwKI=; b=ZM42XxfwSF0y/+cSpQcgI80TSV9rvg7DHD+jvOzTPEW9EkXuIP3c/kFaccoWYg2RoNNL9N YHOYBFH6p59sHEmoYy+FCrIpqrYK/J1R7FLQhqRBoWsd5ieyia2HYjZ/dTgJSmxgRATf4B rw6mAgJ5h1V3qxyDsXuvqH16eOTPka95299baRs4iM+YT4yVIg3KQNePk0oAY201YUoRVn z4UA6P+y2X6gS2LT1O0WmUj1wayV/A0rwZ870x2vg3+5AK/zoMVHlHDL9vMOmtJah71ppN Octhl0DkGDznd2q2ov28ZYzbs+Hzf7K2bB+MVtUZsqzSQCTbKoMt90EtivZgqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808178; a=rsa-sha256; cv=none; b=Qgbah+kLIWhn0ZnV91do7dWKxSOCWcu/55IPGkd1wiHBh9WEVvonPolYSWGNknkbW/hR4I yGt/zaqBNBW1wgxckqNcaJCIaNZg0JsLa8JD7PUocF4eu2NJQNLhdz8XF5APAakp/TeNG9 182r90sZKY7CrFaeSseS6thvTSp9HWCI/nGr1ITWxYaPHrysuKulVie2jFUNijDXB5K3Y+ cI6HokSg6rcREt0MM6E13p94VM7EFjgdL4O1ghIZNUrzJDFIQoJRSJR/C5ua65JabegpF8 EVl94CZWv4R6W0ur2A23XMBE+e6dR4OZGI5TfeaHn2TYPh0JFxEeQrsst613dg== 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 4dVMYZ0ftSz7Wl for ; Mon, 15 Dec 2025 14:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:16:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dd38b346ad17 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: dd38b346ad17faf5fc76ab288272ca0768516c4d Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:16:18 +0000 Message-Id: <69401832.35fef.6b93a347@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dd38b346ad17faf5fc76ab288272ca0768516c4d commit dd38b346ad17faf5fc76ab288272ca0768516c4d Author: Mark Johnston AuthorDate: 2025-12-04 15:00:46 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:10:25 +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)