From nobody Tue May 19 23:03:59 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 4gKqwv5J2fz6dhhy for ; Tue, 19 May 2026 23:03:59 +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 4gKqwv4XHFz44q3 for ; Tue, 19 May 2026 23:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779231839; 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=De7dgrRrUe914M21yMFLHPn63v/fhE9iWjaMQI3qH+c=; b=RNoQzRIlUoofka40SpfMh5pVecf3U7axgJsevgneVsVKIrwfdj80bvLLPhaE6yG9Kqf00J Qp6Qwduz2zWqAg+IJ10m8WInMlFW3clBP6wpj/fOVBYVASTQvu0N+Gjnz4Qd4oQOsxP/qk GuofGHr0i3qOBlWPfCBlW9LXCnlshDDYrzY3nurqBjaki5TZTpreo0Ax8Of78TTJhlKNBC MPW2GjOS7XCDZhtmuVCQnepeheA8IQoALVFOee8T7Iu3dhur9wuE4aJ24Es7c+oQ/z5rXp hbLz3EAKy+YI3pxvTtzhyJevdJuPexU2mUEZxbtCqAXyu9Cngzx7dp+OLXJlvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779231839; a=rsa-sha256; cv=none; b=XoByyVY1gWdnADIwlbMtxrFoNrFFAvyZxPWLJxw06pUoiI1347kj4sE04itfm+czMKDdMq ziKHlmb3HfPk71ojZx4954Jxt9cdvpIh4VTxiVFcd2NPISwAN6eDsGcMid0fJDUDeuBzq4 loYB1S1DjOkLXoTNaFXXGW/HxCKij+7TBzpSUjtW9DXGDUdmdPwocu2HRI652FLJfDOZdu 7QvtOo+LHI82f8xMiki4wgHxEWtqFiB2EXN8WaxJGftt4gFUzzdRhMy5uHqQzbBSalIT/n 2vUgmJKFWs8d5TkS2BboggCncZYqhSIdwFFwbfIGX9WkW0p+8ApRvomDD8X2HQ== 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=1779231839; 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=De7dgrRrUe914M21yMFLHPn63v/fhE9iWjaMQI3qH+c=; b=hOSeyd69xk3Jtphc+fRIslmXzqZxGNio0I+Kz7lwMgqYM9v14/eCmxDv0CMoWM8QxvK59c ZZ3xfjBtirCe9RmN+4zAkHTgZ7TajxL7KYDM1YlMVS8TKCRmFLKKYPwILDdRPjhP/vrQc4 UEHCwj2e8SDgb1wUkxpNZenQRRozcJCzTx2J4uS+6scNQVufSzvp/5aBnh3jC+Ybs/s6tU BADLBGCu0d5E0ZHSvRuUrKe1NQuPtlsLJ4lfxCcnU7uwhB63KxMv++EXDEnLR8eVBnAOSZ A1BPTaFIrmherqDYFyGea5/RSqgAbXNaLW2v5mM1F10OXgp921UE7r6EjcJSdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKqwv3phJzbqt for ; Tue, 19 May 2026 23:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d70f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 23:03:59 +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: 7eb3fd691d64 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 7eb3fd691d64dd42f9d32e04cb9b5811fd7c8e55 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 23:03:59 +0000 Message-Id: <6a0cec5f.1d70f.228cfd3@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb3fd691d64dd42f9d32e04cb9b5811fd7c8e55 commit 7eb3fd691d64dd42f9d32e04cb9b5811fd7c8e55 Author: Mariusz Zaborski AuthorDate: 2026-05-12 08:33:41 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 23:03:26 +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 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) {