From nobody Wed May 20 19:39:38 2026 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 4gLMLg0LXjz6fJl9 for ; Wed, 20 May 2026 19:39:39 +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 4gLMLf3dpHz3Y6v for ; Wed, 20 May 2026 19:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305978; 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=8fv5tNjOtCwX5AnLpqVsr1/FeqY7ZCny7opHTtFMLas=; b=YgGt86ZnD2h2fKN+A0mvopzGDFsZ5hvZciIfIW5/FbSY1fJbs9/0vHFe9X9NY1gfzp3uBP WqjM+0zQgvxx+ppwEi1VRuCNM0t7BNnhETj4bW12VBU07VzgqNeVOa6Kt4r0vJCSZTxrrC /lZKWqF1WY/W3eAaAZpP6iYddbULSnQhcO5FVo7i/lhVN594akKtsF3fL2nNDfgLbzXxpx LH6pK2Q1Fk1G9IpwzJv8xokcnFIan4yi9PfovzF1QLWeb+KVTzzFDd3Sx2uxXlK0YrVGi/ T0ooH3Zm0s4sqlOINMn+/eOMOx00Hq7S469htNTCNI9Y5/Je2LKV6n9vmI8wpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305978; a=rsa-sha256; cv=none; b=RaXoNT2mwywi9GTRtOJsUXJnObjsbQVedZNF6dozdDfrxIhMzH+V+kgBTHRtAI9QoDrbkG stGHIPQRqh/IYhpsrlUeUIoYVyy+Gp3ga8Bm1dcRPTDkTUTrHpywCJY9x0CCDT2726l4rG oGEf77m/e8lgcMQfUm5NyXse+q+FoYOSNIzJv8putHfmf2wDuEjYbPhqD6Wz6NeQgNs75U /9y4wX17wHypkIQwaPrGm5vq4UXeIpUD60KuU73KmWyBBITPAs+IpRpyiKR3kypQJvANOL JBwTbpk5GSVF8VzPwcVb6ZUFYz9AdtyjWERgo3CC8PjWsSx05cFhQGXstZyGJQ== 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=1779305978; 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=8fv5tNjOtCwX5AnLpqVsr1/FeqY7ZCny7opHTtFMLas=; b=b9WEEV0Q6sikdFk4D+j/HuLeE6Fb9TgpqzJcILQstw+O7lh7/ZnkO/oW7rRzyDNrzh0dEf 7WwaFbBv+w1Lf1aY3BOHEtYKIW1jd8i82/3YlwwQeHwLzEC8tmKjlg4yK8rDJUdPBuDZVW kPswXmnamrVNwbLDwX0xDQXlIE6NA6FfRS8tQbmHcKERzUXuQKUQ7guBqDpbJiyGb+J0Pa HIWN/rBHlPlVeRLIZysGclEfJ3DRV0Ecq3yWIJ8ZmwbsAypRF0c4ww12KoXgpOu76wJK1r eVlXERVXzc9zi0N8aAWiz4yTjGrCC+g58f9uDfHFuTD0wtqJRO7hhFqS57FLQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMLf36Frz1Dhg for ; Wed, 20 May 2026 19:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3850f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:39:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mariusz Zaborski From: Mark Johnston Subject: git: f69df16fcc20 - releng/15.0 - cap_net: do not allow new limits to drop keys from the old ones 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f69df16fcc204e2ec651c8465343611f370c2f8e Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:39:38 +0000 Message-Id: <6a0e0dfa.3850f.7aa9ed21@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f69df16fcc204e2ec651c8465343611f370c2f8e commit f69df16fcc204e2ec651c8465343611f370c2f8e Author: Mariusz Zaborski AuthorDate: 2026-05-12 08:33:41 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 23:52:31 +0000 cap_net: do not allow new limits to drop keys from the old ones If the old limit had family/hosts/sockaddr set, the new limit must have them too. Before, a missing key in the new limit was treated as "allow any", which let a caller silently extend their limits. Approved by: so Security: FreeBSD-SA-26:24.cap_net Security: CVE-2026-45254 Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D56991 (cherry picked from commit d705a519525f2acae3c1efba11436ec6ee8aea0a) (cherry picked from commit 7eb3fd691d64dd42f9d32e04cb9b5811fd7c8e55) --- lib/libcasper/services/cap_net/cap_net.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 5887fe3c407e..67eec73cae7e 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1122,12 +1122,37 @@ net_connect(const nvlist_t *limits, nvlist_t *nvlin, nvlist_t *nvlout) return (0); } +/* + * If the old sublimit restricted a subkey, the new one must too; + * a missing subkey means "allow any" at request time. + */ +static bool +verify_subkeys_present(const nvlist_t *oldfunclimits, + const nvlist_t *newfunclimit) +{ + void *cookie; + const char *name; + + if (oldfunclimits == NULL) + return (true); + + cookie = NULL; + while ((name = nvlist_next(oldfunclimits, NULL, &cookie)) != NULL) { + if (!nvlist_exists(newfunclimit, name)) + return (false); + } + return (true); +} + static bool verify_only_sa_newlimts(const nvlist_t *oldfunclimits, const nvlist_t *newfunclimit) { void *cookie; + if (!verify_subkeys_present(oldfunclimits, newfunclimit)) + return (false); + cookie = NULL; while (nvlist_next(newfunclimit, NULL, &cookie) != NULL) { void *sacookie; @@ -1200,6 +1225,9 @@ verify_addr2name_newlimits(const nvlist_t *oldlimits, LIMIT_NV_ADDR2NAME, NULL); } + if (!verify_subkeys_present(oldfunclimits, newfunclimit)) + return (false); + cookie = NULL; while (nvlist_next(newfunclimit, NULL, &cookie) != NULL) { if (strcmp(cnvlist_name(cookie), "sockaddr") == 0) { @@ -1258,6 +1286,9 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, LIMIT_NV_NAME2ADDR, NULL); } + if (!verify_subkeys_present(oldfunclimits, newfunclimit)) + return (false); + cookie = NULL; while (nvlist_next(newfunclimit, NULL, &cookie) != NULL) { if (strcmp(cnvlist_name(cookie), "hosts") == 0) {