From nobody Mon Oct 23 21:09:54 2023 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 4SDnrf53dkz4yVhQ; Mon, 23 Oct 2023 21:09:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDnrf4Qv3z3TW2; Mon, 23 Oct 2023 21:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698095394; 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=fZs9DweRE23qISofwTvVuMHLn+7uRLjs0ndnfPxHmfk=; b=DfywR7RenFLSnxlVJnEo5syT/dt8uujMpAyLc0DU0Fnl2EfHubErhe38kPOUZhmjFFpaln UY6WPByFq7yBf4G0+IRQEaN9tQ0tcRHdO5BbPCBayBX7aq+8fLX5jzAwzKQFpcrgy28Hbq wMrbybtfxxSA0Kc/6xTMWQdjZ9TGK/IEagqN6tbZgz9GeyZ9rWVE/6Q89OqdbXexqKXtQ/ 4ANo1hEAPRyooLwtrLK9t0fwwW4GqmBIwM1GXUayqAHZNTW65/FM+c8uEBl6lu/3ONuInc oH6uK02xLbxDSo5BnCsvGf0mZ0SdGRdwFEFiUo+X2EL+1L9ag4ZVXpE4aulNlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698095394; a=rsa-sha256; cv=none; b=NByS4mEbsQJ6L6AxsYoxkyp5CbdU/99vyg9TqiFIIGUWyM3L6vOLYTHx8cvqCwKZCXZGf6 yfkDtaRDzS5gpQsMaIrz8WblO2jgvtoNWuRZMaaaaOTNYYy7L7Kci0wGpDZ3ELT0V1Zw21 vdqBgj622hok9onGFGjeJNVVY4sExoItFySXcvZWRP2otaEEUqLUE1ZfezHRnI2W1ni5D2 Nxt8bgvZ54cQOdl7cNL1tuCrLIAVhpBPVLNbVP9vGq8/yJoDyOL6eSMhriwcuJdkZcUWOH Pr/DI+m31lmPHYSLjU7WMOCJwlczWapZ4RnVaU4ZbXlAz/W4+k+lVy5MwW3xJg== 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=1698095394; 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=fZs9DweRE23qISofwTvVuMHLn+7uRLjs0ndnfPxHmfk=; b=B/Ft1tE2KB05irtdjQLwMcb/2ItZnLUKnoJIo+9uuyLVybBrvVWYwX5Ooc4GnqdR93TmyL sCmp2vDElbrNm3FPHjmzb4aJPNA1yWRTTdA38X1df7y0SupU7p93Awe0ZGC8zzYYb1SR3T 7UVqU5FAS8EwxzuqcZorQ2V26UNyFOTvscw3fxI9643p0S/i8K++CNHkzbIUQU0Ga1ZsEa pDreqoZg5hsoLzpyiZlHZiBktLu4qlS7U2ycWCoRtwB9ABPrl4U627WeJXU9T2jQos7ZRa rRXbuCFaqAFbNPDCqOnCaP2SlfcU0QTl6bzkr3+VBGkZ5tsCP8dxDag52dvrZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDnrf3Rrzzw6w; Mon, 23 Oct 2023 21:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NL9smc036392; Mon, 23 Oct 2023 21:09:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NL9sWD036389; Mon, 23 Oct 2023 21:09:54 GMT (envelope-from git) Date: Mon, 23 Oct 2023 21:09:54 GMT Message-Id: <202310232109.39NL9sWD036389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: afd74c400075 - main - cap_net: correct capability name from addr2name to name2addr 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: afd74c400075d94e01dd3430844bb290834660ef Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=afd74c400075d94e01dd3430844bb290834660ef commit afd74c400075d94e01dd3430844bb290834660ef Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Mariusz Zaborski CommitDate: 2023-10-23 21:11:23 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index bbb2a666440f..a8f039f81843 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 5522f92516eb..dcb897de467b 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -783,6 +783,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); }