From nobody Mon May 18 15:25:42 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 4gK1ph3t7Cz6fWqM for ; Mon, 18 May 2026 15:25:48 +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 4gK1ph01Ycz3mGY for ; Mon, 18 May 2026 15:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779117948; 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=w+aU423KzhfskeR4B6d9RTtGcB1KztRFMANViUPlfk8=; b=K1AScBrifXi+JcAexVR+DrSGfG06zKKINrwo7sV+t5yYbhilCZmrUqGa2682W6h2s3xoDI 2qZhFftGswMA1mZGBBBZlrVd/JYeAtOTZWJ+dSd9yTMHaYs1Yz9KJ7HxDRQgWLhSAHvX9c krnaQi52BSPKupo8Vt8Ir0pyvc0HqcfLazmdrCg06RbGER/6iASrJaA5+NDpLShzBxwGCF fCM50qpYocKldGqAxZ3CuRk3A8+QCXIbpOfUqbzXUAZWxGILd89gBKXcKZwEMqro6p3MsX 7cpZvLcytVsCpjIlz48mk5xaxWMd48vBJHQqfmYFmar0JfpDugbtK/ip3qo0sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779117948; a=rsa-sha256; cv=none; b=a3vBnwdPMvHr4/m3sK8T4tKh4f7Kp8Ko2YaeSoe7s4pl02OG9TJN2x3DtIDszsIEdrGo+x Um/Cnhevocin+tgMfoSFUPqf/p4E3dBnbTYYCObv/LQX0Rhx/rR7QJIYNxaTAlCu8gO1AP 1dFHpQ8TPNc0T1diSc+Pt70iKLcqTL9+9bQp4Jy6NQI4CcAq4whaW5mtUeo75VdrzGmWgU AZer23FNwup8Ht+057a0o5JBge2GbEdPwy6Lc8tCLIvGoxVI6wdrzoGlzVxLZgE8KMjEa/ oMoccs4CAO2wraGi4DN/y/YvfPS7n05lpnYuCOaLySXNz4W6jWnzgAfzwkGoCQ== 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=1779117948; 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=w+aU423KzhfskeR4B6d9RTtGcB1KztRFMANViUPlfk8=; b=Z1uO+9gSbJmm9fi1Et+8RUKhUSFuSgDICC/CKYOnrHnITAkcHv3HxKFPHbB8q/4oZG/xV+ e1v/5CFWZL5hBZMS3rQAOEixNPjWvWuPu20ImcdpSzOIW2QOYP/mIKGD3UWwzv+hHCdjRn purwir+anMUinOSnt2Tdk6domm8ENE3+bzyBFrpt+ziFBozIv+aUbKSRTx0d1fCwCL94jC oP5Ra42tY1+6KOPNgBLgsaNDox1I2iDCh5JoFriuc3oGd/gB91lTmLQBtuMlK38LifM1NQ 1rSO24ccvzahlVGf5j0JYSSkWcEaUGP5MSYepQlcydXDKMOhOnmABPYN1YBwdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gK1pg5gmVzZfT for ; Mon, 18 May 2026 15:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43916 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 18 May 2026 15:25:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: d705a519525f - main - 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d705a519525f2acae3c1efba11436ec6ee8aea0a Auto-Submitted: auto-generated Date: Mon, 18 May 2026 15:25:42 +0000 Message-Id: <6a0b2f76.43916.7efa6342@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=d705a519525f2acae3c1efba11436ec6ee8aea0a commit d705a519525f2acae3c1efba11436ec6ee8aea0a Author: Mariusz Zaborski AuthorDate: 2026-05-12 08:33:41 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-18 15:18:43 +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 --- 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 59124e3cb54f..e04cad1d834c 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) {