diff options
| author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2023-10-23 21:03:51 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-11-08 00:45:34 +0000 |
| commit | 5f4fc91cc87c99d9995fd05e6029960d692bb397 (patch) | |
| tree | 351e8cf34ce2738502d2e42a947ff8aff38b02c9 | |
| parent | 1f9c4610dde5ecda4ad219b19f16ec712bc1d793 (diff) | |
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 <shawn.webb@hardenedbsd.org>
(cherry picked from commit afd74c400075d94e01dd3430844bb290834660ef)
(cherry picked from commit 765757c6301fa41c0b59108347c600fbc9020c39)
Approved by: so
Approved by: re (implicit)
Security: FreeBSD-SA-23:16.cap_net
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | lib/libcasper/services/cap_net/cap_net.c | 2 | ||||
| -rw-r--r-- | lib/libcasper/services/cap_net/tests/net_test.c | 12 |
2 files changed, 13 insertions, 1 deletions
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); } |