From nobody Tue May 19 23:04:13 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 4gKqxB04NVz6dhnm for ; Tue, 19 May 2026 23:04:14 +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 4gKqx95Yvnz45GS for ; Tue, 19 May 2026 23:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779231853; 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=Yu9jLFI5QjxiVJrR5omHpa1RIGqkN+DTQ5vxLOFvML8=; b=QD/RHD/eQZUOjhxjcVOIfPVwA0TaxPs0khCmJsgd8uYsrD4wUcU/cqlo7bVbG2mEtp6Czr ziRXkOo1GKpExag9Oob2fkBXhniQd/g7O3pNaqMegWnjxmIXf6vnToISw0yQ7sA9pIGQHW 3Dk7/3nXET68j9EqyZGTB3WH7JeT8F3mqwjk9CC5K2Et7oD6lGiguWT+N/3k0soZlENO8e 0NG7r9K3ofNTD3KLyVB3YbHaytt3FyTUvsijLcLIBc+WCgsG5mBVjZAwDPiEB+kptvDXDG qPxLo5exGnoK6lfdRP84bIyA+BMOtGzUUP6DpV20K54qPcmc6q+A5B0GNKSBNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779231853; a=rsa-sha256; cv=none; b=craN5Qh6JP4jk68lKV+hZtQdfzRkqCcRVNDtgPUPBfJvQl01l/XAaCa94NCRp0WzNIwZmM 2ggDzcjBZDRcvCtlqO32vlMo87Y1WpQVO+A2jUY8Gx0afb/GGkLVW3/V62qu/XhWkk5i10 wndJb0+5ULRRqLwlCDq4f+HmrlRcpn/gg5pw99H7XyBw8CyPEZS2tGoIcM4LgZUxTWkdYd +eCKEQsGMWfGWKFpyJoTSonSpNrxldRQaBx55rQ+0OlDNsjiWJ6/mF5cJCsHY9QutsN29M P6JdZ8GoEfnHOXGSUFC02U38HNuuz1LBaJYj14bo1JdhJsN9zbWETAjlsEuHdA== 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=1779231853; 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=Yu9jLFI5QjxiVJrR5omHpa1RIGqkN+DTQ5vxLOFvML8=; b=UGnQIKf9hsP9hyOlkn7fPEORTjAP1SXHfP8QUW40yp/SLhqmQrEAGyUg8b5jUVIr0u/99P vamxIYHc5oaRG/jgcYZQMAqFa2CUJgmsPjMglBI+id98oxyaLJlffjuMbkXMZ8IpuN1pDA BDR027GauqqrZlP6ZPW3pxzz+Arba/WYHTD/Hq9wKQ32oBHIzRMqxSkvV1NyXvRTtjL+Wn sQOgnXrAwuZjsB/rJ+laLe97JxvyAvV3JLqawDSsfumyBOlK8Fj16f6p+Y+ue3BZJ+KQwm XE43H1nZB6UA8sEbZT5f7lv/OY6vHz0wLBf5y+de7JWUlBbL3zhMl4V+4U9Eng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKqx94Xgjzbqv for ; Tue, 19 May 2026 23:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18dec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 23:04:13 +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: b79faca1c596 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b79faca1c5964d89c125d02de35928b733041f3f Auto-Submitted: auto-generated Date: Tue, 19 May 2026 23:04:13 +0000 Message-Id: <6a0cec6d.18dec.5523895e@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b79faca1c5964d89c125d02de35928b733041f3f commit b79faca1c5964d89c125d02de35928b733041f3f Author: Mariusz Zaborski AuthorDate: 2026-05-12 08:33:41 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 23:04:05 +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. 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) --- 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 40d18319ae28..303a8e4b2120 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1099,12 +1099,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; @@ -1177,6 +1202,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) { @@ -1235,6 +1263,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) {